diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 12:01:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 12:01:35 +0200 |
| commit | 96e6447d6233ac55f6dd4c50c9afefe99fefe773 (patch) | |
| tree | 2e48a53cf7d93332ad999b046a72b1f91ee8a064 /libavformat/avformat.h | |
| parent | 22f79a2d605f3c3b36bb05e9609ff3a3dc27d1f9 (diff) | |
| parent | 596e5d4783ca951258a7c580951fd161f1785ec1 (diff) | |
Merge commit '596e5d4783ca951258a7c580951fd161f1785ec1'
* commit '596e5d4783ca951258a7c580951fd161f1785ec1':
lavf: Add a flag to enable/disable per-packet flushing
Conflicts:
libavformat/avformat.h
libavformat/mux.c
libavformat/version.h
This adds a 2nd API to set per packet flushing
If the user application indicates through either a non default then this non default takes
precedence over the other still default value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 9dea62eb5f..b18eb3f545 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1043,6 +1043,7 @@ typedef struct AVFormatContext { #define AVFMT_FLAG_NOBUFFER 0x0040 ///< Do not buffer frames when possible #define AVFMT_FLAG_CUSTOM_IO 0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it. #define AVFMT_FLAG_DISCARD_CORRUPT 0x0100 ///< Discard frames marked corrupted +#define AVFMT_FLAG_FLUSH_PACKETS 0x0200 ///< Flush the AVIOContext every packet. #define AVFMT_FLAG_MP4A_LATM 0x8000 ///< Enable RTP MP4A-LATM payload #define AVFMT_FLAG_SORT_DTS 0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down) #define AVFMT_FLAG_PRIV_OPT 0x20000 ///< Enable use of private options by delaying codec open (this could be made default once all code is converted) |