diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-09 00:10:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-09 00:18:50 +0100 |
| commit | c79c7ffc9da7b954709fcccdcaea1abb27132691 (patch) | |
| tree | 5e2b26cc2599ecc9210b6f4253b0bd207f67e159 /libavcodec/sanm.c | |
| parent | 9c52ab6f4f32466a2c263d393e73548d1f0f47c1 (diff) | |
| parent | d42db44cfe58493eb26d2d2f307ced4dd4ca1978 (diff) | |
| download | ffmpeg-c79c7ffc9da7b954709fcccdcaea1abb27132691.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avienc: drop the vfr flag.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sanm.c')
0 files changed, 0 insertions, 0 deletions