diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-21 21:57:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-21 22:37:43 +0200 |
| commit | 87dced8074cf83e74e69d7dee725c8d62601c4e8 (patch) | |
| tree | 7fda3c5c5510001e32cbbeddc4030e5e84df1138 /libavcodec/options_table.h | |
| parent | fd0b8c6ad53ff2a01868ecf1bbf0c936876a0c61 (diff) | |
| parent | 1d01fee980edf60215acd94daf2533a9fefb9342 (diff) | |
| download | ffmpeg-87dced8074cf83e74e69d7dee725c8d62601c4e8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fix hardcoded tables compililation caused by missing math constants
lavf: Make codec_tag arrays constant
twinvq: give massive struct a name.
lavf, lavu: version bumps and APIchanges for av_gettime() move
lavfi/audio: don't set cur_buf in ff_filter_samples().
lavfi/fifo: add audio version of the fifo filter.
fifo: fix parenthesis placement.
lavfi: rename vf_fifo.c -> fifo.c
lavc: remove stats_in from AVCodecContext options table.
Conflicts:
doc/APIchanges
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/audio.c
libavfilter/fifo.c
libavformat/version.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/options_table.h')
| -rw-r--r-- | libavcodec/options_table.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 92b19e23a2..f4d46190b6 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -167,7 +167,6 @@ static const AVOption options[]={ {"block_align", NULL, OFFSET(block_align), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, {"mpeg_quant", "use MPEG quantizers instead of H.263", OFFSET(mpeg_quant), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"stats_out", NULL, OFFSET(stats_out), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX}, -{"stats_in", NULL, OFFSET(stats_in), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX}, {"qsquish", "how to keep quantizer between qmin and qmax (0 = clip, 1 = use differentiable function)", OFFSET(rc_qsquish), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, 0, 99, V|E}, {"rc_qmod_amp", "experimental quantizer modulation", OFFSET(rc_qmod_amp), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, -FLT_MAX, FLT_MAX, V|E}, {"rc_qmod_freq", "experimental quantizer modulation", OFFSET(rc_qmod_freq), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, |