[FFmpeg-cvslog] ffmpeg: dont allow -flags to override -pass

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  6 01:25:52 2013 +0100| [5f3fa5f930875e22664fbd403b107b3a37fb4d77] | committer: Michael Niedermayer

ffmpeg: dont allow -flags to override -pass

Fixes Ticket2154

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit ccf9dd00da055e94117b56cead4af80ff331b00e)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f3fa5f930875e22664fbd403b107b3a37fb4d77
---

 ffmpeg_opt.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 46c917a..dd3f4ed 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);
             }
         }