X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg_opt.c;h=048c3df944aa6f6b7759bbd55dc7a202f9d741d4;hb=57848ef3c6a135caeb1f8034cadc157a38947009;hp=f7f65535d2021407caf3ae525aa42376502f5256;hpb=f620315fa5b1710e3a47b80ca2cd4597510804ba;p=ffmpeg

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index f7f65535d20..048c3df944a 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -1204,6 +1204,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
         uint32_t tag = strtol(codec_tag, &next, 0);
         if (*next)
             tag = AV_RL32(codec_tag);
+        ost->st->codec->codec_tag =
         ost->enc_ctx->codec_tag = tag;
     }
 
@@ -1918,7 +1919,7 @@ static int open_output_file(OptionsContext *o, const char *filename)
             for (i = 0; i < nb_input_streams; i++) {
                 int new_area;
                 ist = input_streams[i];
-                new_area = ist->st->codec->width * ist->st->codec->height;
+                new_area = ist->st->codec->width * ist->st->codec->height + 100000000*!!ist->st->codec_info_nb_frames;
                 if((qcr!=MKTAG('A', 'P', 'I', 'C')) && (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC))
                     new_area = 1;
                 if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&