diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-21 02:17:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-21 02:31:27 +0200 |
| commit | 5c08c7b2151409c3b7a05e54fe46834deedff119 (patch) | |
| tree | 521e6530dc916911350aa77b350464fdade32da9 /libavformat/avformat.h | |
| parent | 94eadee7efc2c5d19ecfe92d36f0556663468080 (diff) | |
| download | ffmpeg-5c08c7b2151409c3b7a05e54fe46834deedff119.tar.gz | |
Add a flag to disable side data merging.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 2574bbc424..991b0a4fd5 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -731,7 +731,7 @@ typedef struct AVFormatContext { #define AVFMT_FLAG_MP4A_LATM 0x0080 ///< 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) - +#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Dont merge side data but keep it seperate. int loop_input; /** |