diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 01:25:52 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-02-06 10:12:20 +0100 |
| commit | 86f072ceb3e96b5f47b3c3fb3b96d76f140e7ce2 (patch) | |
| tree | d51d1d5ea89607a7a02ddfbbebfb3e6b72713066 /ffmpeg_opt.c | |
| parent | 21185028b4fb505632f358121e4aca52b47cea0e (diff) | |
| download | ffmpeg-86f072ceb3e96b5f47b3c3fb3b96d76f140e7ce2.tar.gz | |
ffmpeg: dont allow -flags to override -pass
Fixes Ticket2154
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ccf9dd00da055e94117b56cead4af80ff331b00e)
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 d86ef91a76..6ccb3f480f 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1141,9 +1141,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); } } |