[FFmpeg-cvslog] r22562 - in trunk/libavformat: internal.h seek.c utils.c

[aurel]

Author: aurel
Date: Tue Mar 16 00:15:24 2010
New Revision: 22562

Log:
rename av_read_frame_flush to ff_read_frame_flush
it is an internal function, not part of public API

Modified:
   trunk/libavformat/internal.h
   trunk/libavformat/seek.c
   trunk/libavformat/utils.c

Modified: trunk/libavformat/internal.h
==============================================================================
--- trunk/libavformat/internal.h	Tue Mar 16 00:14:07 2010	(r22561)
+++ trunk/libavformat/internal.h	Tue Mar 16 00:15:24 2010	(r22562)
@@ -35,7 +35,7 @@ void ff_program_add_stream_index(AVForma
 void ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt,
                               int (*compare)(AVFormatContext *, AVPacket *, AVPacket *));
 
-void av_read_frame_flush(AVFormatContext *s);
+void ff_read_frame_flush(AVFormatContext *s);
 
 #define NTP_OFFSET 2208988800ULL
 #define NTP_OFFSET_US (NTP_OFFSET * 1000000ULL)

Modified: trunk/libavformat/seek.c
==============================================================================
--- trunk/libavformat/seek.c	Tue Mar 16 00:14:07 2010	(r22561)
+++ trunk/libavformat/seek.c	Tue Mar 16 00:15:24 2010	(r22562)
@@ -237,7 +237,7 @@ static void search_hi_lo_keyframes(AVFor
     }
 
     // Clean up the parser.
-    av_read_frame_flush(s);
+    ff_read_frame_flush(s);
 }
 
 int64_t ff_gen_syncpoint_search(AVFormatContext *s,
@@ -451,7 +451,7 @@ void ff_restore_parser_state(AVFormatCon
     int i;
     AVStream *st;
     AVParserStreamState *ss;
-    av_read_frame_flush(s);
+    ff_read_frame_flush(s);
 
     if (!state)
         return;

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	Tue Mar 16 00:14:07 2010	(r22561)
+++ trunk/libavformat/utils.c	Tue Mar 16 00:15:24 2010	(r22562)
@@ -1228,7 +1228,7 @@ int av_find_default_stream_index(AVForma
 /**
  * Flush the frame reader.
  */
-void av_read_frame_flush(AVFormatContext *s)
+void ff_read_frame_flush(AVFormatContext *s)
 {
     AVStream *st;
     int i, j;
@@ -1620,7 +1620,7 @@ static int av_seek_frame_generic(AVForma
     if (index < 0)
         return -1;
 
-    av_read_frame_flush(s);
+    ff_read_frame_flush(s);
     if (s->iformat->read_seek){
         if(s->iformat->read_seek(s, stream_index, timestamp, flags) >= 0)
             return 0;
@@ -1638,7 +1638,7 @@ int av_seek_frame(AVFormatContext *s, in
     int ret;
     AVStream *st;
 
-    av_read_frame_flush(s);
+    ff_read_frame_flush(s);
 
     if(flags & AVSEEK_FLAG_BYTE)
         return av_seek_frame_byte(s, stream_index, timestamp, flags);
@@ -1673,7 +1673,7 @@ int avformat_seek_file(AVFormatContext *
     if(min_ts > ts || max_ts < ts)
         return -1;
 
-    av_read_frame_flush(s);
+    ff_read_frame_flush(s);
 
     if (s->iformat->read_seek2)
         return s->iformat->read_seek2(s, stream_index, min_ts, ts, max_ts, flags);