Rename our local copy of av_read_frame_flush to xbmc_read_frame_flush as suggested...

That way it makes it clear the function is from xmbc and not ffmpeg.

diff --git a/lib/DllAvFormat.h b/lib/DllAvFormat.h
index 58462c5..a79ec00 100644 (file)
--- a/lib/DllAvFormat.h
+++ b/lib/DllAvFormat.h
@@ -42,8 +42,8 @@ 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);
+  /* 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"
 #endif
@@ -115,7 +115,7 @@ public:
   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) { ::av_read_frame_flush(s); }
+  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); }

diff --git a/lib/xbmc-dll-symbols/DllAvFormat.c b/lib/xbmc-dll-symbols/DllAvFormat.c
index 61ffdf4..4b09663 100644 (file)
--- a/lib/xbmc-dll-symbols/DllAvFormat.c
+++ b/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;