mirrors/librempeg
1
0
Fork 0
mirror of https://github.com/librempeg/librempeg synced 2024-11-23 19:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename av_read_frame_flush to ff_read_frame_flush

Browse Source 
it is an internal function, not part of public API

Originally committed as revision 22562 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2010-03-15 23:15:24 +00:00
parent 588af13fee
commit 972ffe6220
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/internal.h
View File

@ -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, void ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt,
int (*compare)(AVFormatContext *, AVPacket *, AVPacket *)); 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 2208988800ULL
#define NTP_OFFSET_US (NTP_OFFSET * 1000000ULL) #define NTP_OFFSET_US (NTP_OFFSET * 1000000ULL)

4
libavformat/seek.c
View File

@ -237,7 +237,7 @@ static void search_hi_lo_keyframes(AVFormatContext *s,
} }
// Clean up the parser. // Clean up the parser.
av_read_frame_flush(s); ff_read_frame_flush(s);
} }
int64_t ff_gen_syncpoint_search(AVFormatContext *s, int64_t ff_gen_syncpoint_search(AVFormatContext *s,
@ -451,7 +451,7 @@ void ff_restore_parser_state(AVFormatContext *s, AVParserState *state)
int i; int i;
AVStream *st; AVStream *st;
AVParserStreamState *ss; AVParserStreamState *ss;
av_read_frame_flush(s); ff_read_frame_flush(s);
if (!state) if (!state)
return; return;

8
libavformat/utils.c
View File

@ -1228,7 +1228,7 @@ int av_find_default_stream_index(AVFormatContext *s)
/** /**
* Flush the frame reader. * Flush the frame reader.
*/ */
void av_read_frame_flush(AVFormatContext *s) void ff_read_frame_flush(AVFormatContext *s)
{ {
AVStream *st; AVStream *st;
int i, j; int i, j;
@ -1620,7 +1620,7 @@ static int av_seek_frame_generic(AVFormatContext *s,
if (index < 0) if (index < 0)
return -1; return -1;
av_read_frame_flush(s); ff_read_frame_flush(s);
if (s->iformat->read_seek){ if (s->iformat->read_seek){
if(s->iformat->read_seek(s, stream_index, timestamp, flags) >= 0) if(s->iformat->read_seek(s, stream_index, timestamp, flags) >= 0)
return 0; return 0;
@ -1638,7 +1638,7 @@ int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp, int f
int ret; int ret;
AVStream *st; AVStream *st;
av_read_frame_flush(s); ff_read_frame_flush(s);
if(flags & AVSEEK_FLAG_BYTE) if(flags & AVSEEK_FLAG_BYTE)
return av_seek_frame_byte(s, stream_index, timestamp, flags); 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) if(min_ts > ts || max_ts < ts)
return -1; return -1;
av_read_frame_flush(s); ff_read_frame_flush(s);
if (s->iformat->read_seek2) if (s->iformat->read_seek2)
return s->iformat->read_seek2(s, stream_index, min_ts, ts, max_ts, flags); return s->iformat->read_seek2(s, stream_index, min_ts, ts, max_ts, flags);