Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #2633 from aballier/mess

Revert broken part of [6f653c5].
  • Loading branch information...
commit a7703fb74603192f087db90c60877eeed1097f66 2 parents 7d9d409 + b621dd7
@elupus elupus authored
Showing with 7 additions and 8 deletions.
  1. +3 −6 lib/DllAvFormat.h
  2. +4 −2 lib/xbmc-dll-symbols/DllAvFormat.c
View
9 lib/DllAvFormat.h
@@ -42,13 +42,10 @@ extern "C" {
#else
#include <ffmpeg/avformat.h>
#endif
- /* av_read_frame_flush() is defined for us in lib/xbmc-dll-symbols/DllAvFormat.c */
- // void av_read_frame_flush(AVFormatContext *s); // av_read_frame_flush decrepated
- void ff_read_frame_flush(AVFormatContext *s); // internal replacement
+ /* xbmc_read_frame_flush() is defined for us in lib/xbmc-dll-symbols/DllAvFormat.c */
+ void xbmc_read_frame_flush(AVFormatContext *s);
#else
#include "libavformat/avformat.h"
- void ff_read_frame_flush(AVFormatContext *s); // internal replacement
-
#endif
}
@@ -118,7 +115,7 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface
virtual AVInputFormat *av_find_input_format(const char *short_name) { return ::av_find_input_format(short_name); }
virtual void avformat_close_input(AVFormatContext **s) { ::avformat_close_input(s); }
virtual int av_read_frame(AVFormatContext *s, AVPacket *pkt) { return ::av_read_frame(s, pkt); }
- virtual void av_read_frame_flush(AVFormatContext *s) { ::ff_read_frame_flush(s); } // av_read_frame_flush decrepated
+ virtual void av_read_frame_flush(AVFormatContext *s) { ::xbmc_read_frame_flush(s); }
virtual int av_read_play(AVFormatContext *s) { return ::av_read_play(s); }
virtual int av_read_pause(AVFormatContext *s) { return ::av_read_pause(s); }
virtual int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) { return ::av_seek_frame(s, stream_index, timestamp, flags); }
View
6 lib/xbmc-dll-symbols/DllAvFormat.c
@@ -76,8 +76,10 @@ static void flush_packet_queue(AVFormatContext *s)
}
#endif
-/* Taken from libavformat/utils.c */
-void av_read_frame_flush(AVFormatContext *s)
+/* Taken from libavformat/utils.c
+ * Original name is ff_read_frame_flush
+ * */
+void xbmc_read_frame_flush(AVFormatContext *s)
{
AVStream *st;
int i, j;

2 comments on commit a7703fb

@FlyingRat

This fix break builds on osx (see: #2633). Does it work on other platforms with the built in (internal) ffmpeg?

Please sign in to comment.
Something went wrong with that request. Please try again.