Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avienc: drop the vfr flag.
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

libavformat/avienc.c

@@ -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,
 };