diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 01:25:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 01:26:26 +0100 |
| commit | ccf9dd00da055e94117b56cead4af80ff331b00e (patch) | |
| tree | d11634feafb2138c7d3507add893487f42170f56 /ffmpeg_opt.c | |
| parent | a12787960e47e6c6bc9828045da5b8b8db56738d (diff) | |
| download | ffmpeg-ccf9dd00da055e94117b56cead4af80ff331b00e.tar.gz | |
ffmpeg: dont allow -flags to override -pass
Fixes Ticket2154
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 4f320b9b29..bba9dba5de 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1146,9 +1146,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); } } |