diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-09 03:10:04 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-09 03:18:50 +0400 |
| commit | c79c7ffc9da7b954709fcccdcaea1abb27132691 (patch) | |
| tree | 5e2b26cc2599ecc9210b6f4253b0bd207f67e159 /libavformat/avienc.c | |
| parent | 9c52ab6f4f32466a2c263d393e73548d1f0f47c1 (diff) | |
| parent | d42db44cfe58493eb26d2d2f307ced4dd4ca1978 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avienc: drop the vfr flag.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avienc.c')
| -rw-r--r-- | libavformat/avienc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 3401cbc237..27db3f1f12 100644 --- a/libavformat/avienc.c +++ b/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, }; |