diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-11 20:40:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-11 20:56:29 +0100 |
| commit | 419787a2ffe31c6c70e542aae8c93c00f3aeb237 (patch) | |
| tree | 443014672a78e5092b1910e62af847a95c6d240e /libavcodec/qcelpdec.c | |
| parent | 5856bca360c5bc3e340a357d91b1f993c80a7bea (diff) | |
| parent | 547f8345373843fe4428e2b3de6b46de4df797af (diff) | |
| download | ffmpeg-419787a2ffe31c6c70e542aae8c93c00f3aeb237.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
flv: Workaround for buggy Omnia A/XE encoder
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qcelpdec.c')
0 files changed, 0 insertions, 0 deletions