aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-06 01:25:52 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-06 02:03:05 +0100
commit5f3fa5f930875e22664fbd403b107b3a37fb4d77 (patch)
treec2ec3c098f16cdea9b69e0feaefb5b466ca0db8d
parent0e1bb99f26c2fdbef7cbe7a49bd9a3b91344408d (diff)
downloadffmpeg-5f3fa5f930875e22664fbd403b107b3a37fb4d77.tar.gz
ffmpeg: dont allow -flags to override -pass
Fixes Ticket2154 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ccf9dd00da055e94117b56cead4af80ff331b00e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffmpeg_opt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 46c917a357..dd3f4eda5f 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -1153,9 +1153,11 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
if (do_pass) {
if (do_pass & 1) {
video_enc->flags |= CODEC_FLAG_PASS1;
+ av_dict_set(&ost->opts, "flags", "+pass1", AV_DICT_APPEND);
}
if (do_pass & 2) {
video_enc->flags |= CODEC_FLAG_PASS2;
+ av_dict_set(&ost->opts, "flags", "+pass2", AV_DICT_APPEND);
}
}