virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat: add avformat_flush()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
wm4 2014-09-30 18:46:49 +02:00 committed by Michael Niedermayer
parent 83808ee7e9
commit cca44764b9
4 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -15,6 +15,9 @@ libavutil: 2014-08-09
API changes, most recent first: API changes, most recent first:
2015-03-04 - xxxxxxx - lavf 56.25.100
Add avformat_flush()
2015-03-xx - xxxxxxx - lavf 56.24.100 2015-03-xx - xxxxxxx - lavf 56.24.100
Add avio_put_str16be() Add avio_put_str16be()

17
libavformat/avformat.h
View File

@ -2136,6 +2136,23 @@ int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp,
*/ */
int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags); int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
/**
* Discard all internally buffered data. This can be useful when dealing with
* discontinuities in the byte stream. Generally works only with headerless
* formats.
*
* The set of streams, the detected duration, stream parameters and codecs do
* not change when calling this function. If you want a complete reset, it's
* better to open a new AVFormatContext.
*
* This does not flush the AVIOContext (s->pb). If necessary, call
* avio_flush(s->pb) before calling this function.
*
* @param s media file handle
* @return >=0 on success, error code otherwise
*/
int avformat_flush(AVFormatContext *s);
/** /**
* Start playing a network-based stream (e.g. RTSP stream) at the * Start playing a network-based stream (e.g. RTSP stream) at the
* current position. * current position.

6
libavformat/utils.c
View File

@ -2201,6 +2201,12 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts,
return -1; //unreachable return -1; //unreachable
} }
int avformat_flush(AVFormatContext *s)
{
ff_read_frame_flush(s);
return 0;
}
/*******************************************************/ /*******************************************************/
/** /**

4
libavformat/version.h
View File

@ -30,8 +30,8 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVFORMAT_VERSION_MAJOR 56 #define LIBAVFORMAT_VERSION_MAJOR 56
#define LIBAVFORMAT_VERSION_MINOR 24 #define LIBAVFORMAT_VERSION_MINOR 25
#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \