Skip to content
This repository
Browse code

Merge pull request #2633 from aballier/mess

Revert broken part of [6f653c5].
  • Loading branch information...
commit a7703fb74603192f087db90c60877eeed1097f66 2 parents 7d9d409 + b621dd7
Joakim Plate authored April 25, 2013
9  lib/DllAvFormat.h
@@ -42,13 +42,10 @@ extern "C" {
42 42
   #else
43 43
     #include <ffmpeg/avformat.h>
44 44
   #endif
45  
-  /* av_read_frame_flush() is defined for us in lib/xbmc-dll-symbols/DllAvFormat.c */
46  
-  // void av_read_frame_flush(AVFormatContext *s); // av_read_frame_flush decrepated
47  
-  void ff_read_frame_flush(AVFormatContext *s);    // internal replacement
  45
+  /* xbmc_read_frame_flush() is defined for us in lib/xbmc-dll-symbols/DllAvFormat.c */
  46
+  void xbmc_read_frame_flush(AVFormatContext *s);
48 47
 #else
49 48
   #include "libavformat/avformat.h"
50  
-  void ff_read_frame_flush(AVFormatContext *s);    // internal replacement
51  
-
52 49
 #endif
53 50
 }
54 51
 
@@ -118,7 +115,7 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface
118 115
   virtual AVInputFormat *av_find_input_format(const char *short_name) { return ::av_find_input_format(short_name); }
119 116
   virtual void avformat_close_input(AVFormatContext **s) { ::avformat_close_input(s); }
120 117
   virtual int av_read_frame(AVFormatContext *s, AVPacket *pkt) { return ::av_read_frame(s, pkt); }
121  
-  virtual void av_read_frame_flush(AVFormatContext *s) { ::ff_read_frame_flush(s); } // av_read_frame_flush decrepated 
  118
+  virtual void av_read_frame_flush(AVFormatContext *s) { ::xbmc_read_frame_flush(s); }
122 119
   virtual int av_read_play(AVFormatContext *s) { return ::av_read_play(s); }
123 120
   virtual int av_read_pause(AVFormatContext *s) { return ::av_read_pause(s); }
124 121
   virtual int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) { return ::av_seek_frame(s, stream_index, timestamp, flags); }
6  lib/xbmc-dll-symbols/DllAvFormat.c
@@ -76,8 +76,10 @@ static void flush_packet_queue(AVFormatContext *s)
76 76
 }
77 77
 #endif
78 78
 
79  
-/* Taken from libavformat/utils.c */
80  
-void av_read_frame_flush(AVFormatContext *s)
  79
+/* Taken from libavformat/utils.c
  80
+ * Original name is ff_read_frame_flush
  81
+ * */
  82
+void xbmc_read_frame_flush(AVFormatContext *s)
81 83
 {
82 84
     AVStream *st;
83 85
     int i, j;

2 notes 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.