# HG changeset patch # User aurel # Date 1268694924 0 # Node ID cf00e196666a1f34e0a6b2b392922fc70cc680a6 # Parent 36b46032fad50cfa8f940ee7142947387c6cbf62 rename av_read_frame_flush to ff_read_frame_flush it is an internal function, not part of public API diff -r 36b46032fad5 -r cf00e196666a internal.h --- a/internal.h Mon Mar 15 23:14:07 2010 +0000 +++ b/internal.h Mon Mar 15 23:15:24 2010 +0000 @@ -35,7 +35,7 @@ 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) diff -r 36b46032fad5 -r cf00e196666a seek.c --- a/seek.c Mon Mar 15 23:14:07 2010 +0000 +++ b/seek.c Mon Mar 15 23:15:24 2010 +0000 @@ -237,7 +237,7 @@ } // 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 @@ int i; AVStream *st; AVParserStreamState *ss; - av_read_frame_flush(s); + ff_read_frame_flush(s); if (!state) return; diff -r 36b46032fad5 -r cf00e196666a utils.c --- a/utils.c Mon Mar 15 23:14:07 2010 +0000 +++ b/utils.c Mon Mar 15 23:15:24 2010 +0000 @@ -1228,7 +1228,7 @@ /** * 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 @@ 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 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 @@ 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);