diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 13:51:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 13:51:07 +0200 |
| commit | b7ebb49d035205bcfbcc4f1788df5ba1419fadc8 (patch) | |
| tree | e4566b574da96ea49e59e3d5bc03ecbbde903f15 /ffmpeg_opt.c | |
| parent | eb71f027f0581fd732fe33e559e38855f90da66f (diff) | |
| parent | fb722a900fc5cc9e003b9fef25b27ed7fc5547a2 (diff) | |
| download | ffmpeg-b7ebb49d035205bcfbcc4f1788df5ba1419fadc8.tar.gz | |
Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'
* commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2':
avconv: remove -same_quant
Conflicts:
Changelog
doc/faq.texi
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 4db881b721..10c0d04c66 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -83,7 +83,6 @@ int debug_ts = 0; int exit_on_error = 0; int print_stats = 1; int qp_hist = 0; -int same_quant = 0; int stdin_interaction = 1; int frame_bits_per_raw_sample = 0; @@ -989,7 +988,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e } MATCH_PER_STREAM_OPT(qscale, dbl, qscale, oc, st); - if (qscale >= 0 || same_quant) { + if (qscale >= 0) { st->codec->flags |= CODEC_FLAG_QSCALE; st->codec->global_quality = FF_QP2LAMBDA * qscale; } @@ -2390,10 +2389,6 @@ const OptionDef options[] = { "rate control override for specific intervals", "override" }, { "vcodec", OPT_VIDEO | HAS_ARG | OPT_PERFILE, { .func_arg = opt_video_codec }, "force video codec ('copy' to copy stream)", "codec" }, - { "sameq", OPT_VIDEO | OPT_BOOL | OPT_EXPERT , { &same_quant }, - "use same quantizer as source (implies VBR)" }, - { "same_quant", OPT_VIDEO | OPT_BOOL | OPT_EXPERT, { &same_quant }, - "use same quantizer as source (implies VBR)" }, { "timecode", OPT_VIDEO | HAS_ARG | OPT_PERFILE, { .func_arg = opt_timecode }, "set initial TimeCode value.", "hh:mm:ss[:;.]ff" }, { "pass", OPT_VIDEO | HAS_ARG | OPT_SPEC | OPT_INT, { .off = OFFSET(pass) }, |