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

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  6 01:25:52 2013 +0100| [4d9bde86d0242031d387c11d1faf49594ab6ef6b] | committer: Carl Eugen Hoyos

ffmpeg: dont allow -flags to override -pass

Fixes Ticket2154

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

Conflicts:
	ffmpeg_opt.c

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

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

diff --git a/ffmpeg.c b/ffmpeg.c
index dfa0a13..edacf68 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -4068,9 +4068,11 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
         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);
             }
         }