Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Nov 2013 23:10:04 +0000 (00:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Nov 2013 23:18:50 +0000 (00:18 +0100)
* qatar/master:
  avienc: drop the vfr flag.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avienc.c

index 3401cbc..27db3f1 100644 (file)
@@ -661,5 +661,4 @@ AVOutputFormat ff_avi_muxer = {
     .codec_tag         = (const AVCodecTag* const []){
         ff_codec_bmp_tags, ff_codec_wav_tags, 0
     },
-    .flags             = AVFMT_VARIABLE_FPS,
 };