diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 00:05:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 00:06:22 +0200 |
| commit | 8c118207ea0b2fa4a1e8e54f19965c7dfda3755c (patch) | |
| tree | 8293671919c90f4ea0dba16df583a13522a4a6e9 /libavresample/audio_convert.c | |
| parent | 406632d1ef448ca6ada969b2f72707a6449a4046 (diff) | |
| parent | aaeef7fa0d6ebb1a3668894e67a70cd5084ce4f4 (diff) | |
| download | ffmpeg-8c118207ea0b2fa4a1e8e54f19965c7dfda3755c.tar.gz | |
Merge commit 'aaeef7fa0d6ebb1a3668894e67a70cd5084ce4f4' into release/1.1
* commit 'aaeef7fa0d6ebb1a3668894e67a70cd5084ce4f4':
mjpegdec: properly report unsupported disabled features
Prepare for 9.7 Release
update Changelog
proresdec: support mixed interlaced/non-interlaced content
Conflicts:
RELEASE
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_convert.c')
0 files changed, 0 insertions, 0 deletions