RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  avienc: drop the vfr flag.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-09 00:10:04 +01:00
parent 9c52ab6f4f d42db44cfe
commit c79c7ffc9d
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/avienc.c
View File

@ -661,5 +661,4 @@ AVOutputFormat ff_avi_muxer = {
.codec_tag = (const AVCodecTag* const []){ .codec_tag = (const AVCodecTag* const []){
ff_codec_bmp_tags, ff_codec_wav_tags, 0 ff_codec_bmp_tags, ff_codec_wav_tags, 0
}, },
.flags = AVFMT_VARIABLE_FPS,
}; };