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/options_table.h | |
| parent | 22f79a2d605f3c3b36bb05e9609ff3a3dc27d1f9 (diff) | |
| parent | 596e5d4783ca951258a7c580951fd161f1785ec1 (diff) | |
| download | android_external_ffmpeg-96e6447d6233ac55f6dd4c50c9afefe99fefe773.tar.gz android_external_ffmpeg-96e6447d6233ac55f6dd4c50c9afefe99fefe773.tar.bz2 android_external_ffmpeg-96e6447d6233ac55f6dd4c50c9afefe99fefe773.zip | |
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/options_table.h')
| -rw-r--r-- | libavformat/options_table.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/options_table.h b/libavformat/options_table.h index a87868e162..527943932a 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -37,7 +37,8 @@ static const AVOption avformat_options[] = { {"direct", "reduce buffering", 0, AV_OPT_TYPE_CONST, {.i64 = AVIO_FLAG_DIRECT }, INT_MIN, INT_MAX, D|E, "avioflags"}, {"probesize", "set probing size", OFFSET(probesize), AV_OPT_TYPE_INT, {.i64 = 5000000 }, 32, INT_MAX, D}, {"packetsize", "set packet size", OFFSET(packet_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, E}, -{"fflags", NULL, OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, INT_MIN, INT_MAX, D|E, "fflags"}, +{"fflags", NULL, OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = AVFMT_FLAG_FLUSH_PACKETS }, INT_MIN, INT_MAX, D|E, "fflags"}, +{"flush_packets", "reduce the latency by flushing out packets immediately", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_FLUSH_PACKETS }, INT_MIN, INT_MAX, D, "fflags"}, {"ignidx", "ignore index", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_IGNIDX }, INT_MIN, INT_MAX, D, "fflags"}, {"genpts", "generate pts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_GENPTS }, INT_MIN, INT_MAX, D, "fflags"}, {"nofillin", "do not fill in missing values that can be exactly calculated", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NOFILLIN }, INT_MIN, INT_MAX, D, "fflags"}, |