diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-03-15 23:15:24 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-03-15 23:15:24 +0000 |
| commit | 972ffe6220ac9100fee4140fedb27e24679425de (patch) | |
| tree | 628f24ca7925023bb9b9d71565259b5a253d92a5 | |
| parent | 588af13feec4c56dc2a1089420b5d7cf8e13e762 (diff) | |
| download | ffmpeg-972ffe6220ac9100fee4140fedb27e24679425de.tar.gz | |
rename av_read_frame_flush to ff_read_frame_flush
it is an internal function, not part of public API
Originally committed as revision 22562 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/internal.h | 2 | ||||
| -rw-r--r-- | libavformat/seek.c | 4 | ||||
| -rw-r--r-- | libavformat/utils.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index 43ad67dc44..1110ce8312 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -35,7 +35,7 @@ void ff_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int i 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 --git a/libavformat/seek.c b/libavformat/seek.c index a2e09a2fd4..a2900b46e0 100644 --- a/libavformat/seek.c +++ b/libavformat/seek.c @@ -237,7 +237,7 @@ static void search_hi_lo_keyframes(AVFormatContext *s, } // 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(AVFormatContext *s, AVParserState *state) int i; AVStream *st; AVParserStreamState *ss; - av_read_frame_flush(s); + ff_read_frame_flush(s); if (!state) return; diff --git a/libavformat/utils.c b/libavformat/utils.c index 8d92d02032..fa7e8dea77 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1228,7 +1228,7 @@ int av_find_default_stream_index(AVFormatContext *s) /** * 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(AVFormatContext *s, 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, int stream_index, int64_t timestamp, int f 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 *s, int stream_index, int64_t min_ts, int 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); |