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/options.c | |
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/options.c')
-rw-r--r-- | libavformat/options.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/options.c b/libavformat/options.c index 82be8487eb..5e0e3a428d 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -51,6 +51,7 @@ static const AVOption options[]={ {"igndts", "ignore dts", 0, FF_OPT_TYPE_CONST, {.dbl = AVFMT_FLAG_IGNDTS }, INT_MIN, INT_MAX, D, "fflags"}, {"rtphint", "add rtp hinting", 0, FF_OPT_TYPE_CONST, {.dbl = AVFMT_FLAG_RTP_HINT }, INT_MIN, INT_MAX, E, "fflags"}, {"sortdts", "try to interleave outputted packets by dts", 0, FF_OPT_TYPE_CONST, {.dbl = AVFMT_FLAG_SORT_DTS }, INT_MIN, INT_MAX, D, "fflags"}, +{"keepside", "dont merge side data", 0, FF_OPT_TYPE_CONST, {.dbl = AVFMT_FLAG_KEEP_SIDE_DATA }, INT_MIN, INT_MAX, D, "fflags"}, {"latm", "enable RTP MP4A-LATM payload", 0, FF_OPT_TYPE_CONST, {.dbl = AVFMT_FLAG_MP4A_LATM }, INT_MIN, INT_MAX, E, "fflags"}, {"analyzeduration", "how many microseconds are analyzed to estimate duration", OFFSET(max_analyze_duration), FF_OPT_TYPE_INT, {.dbl = 5*AV_TIME_BASE }, 0, INT_MAX, D}, {"cryptokey", "decryption key", OFFSET(key), FF_OPT_TYPE_BINARY, {.dbl = 0}, 0, 0, D}, |