diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-15 10:09:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-15 10:35:26 +0200 |
| commit | f1ca40ee00402102046fc7e59606651930436b0e (patch) | |
| tree | d64b21cfabf26f3a2b1a3208745b6cc7e7081a26 /libavresample | |
| parent | ab94d1be7a32f6d3714935ad5ae551a753024ae6 (diff) | |
| parent | 1c56cdad337a39951f26b17bdc8068d75a19ffca (diff) | |
| download | ffmpeg-f1ca40ee00402102046fc7e59606651930436b0e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
riff: Add SVQ3 fourcc
fate: ac3: add 4.0 and downmix tests
configure: x86: improve ebp availability check
vorbisdec: ensure FASTDIV denominator is never 1
avformat: refactor avformat_close_input
avformat: simplify avformat_close_input
Conflicts:
configure
libavcodec/vorbisdec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions