diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-21 02:49:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-21 04:25:11 +0200 |
| commit | 3c033d00f5990e48b14f962d33c362f76695fb07 (patch) | |
| tree | 261e11fc02302638fd451f9f0d3741fc444cc28c /libavutil/version.h | |
| parent | 85761efa95fd7cfb104fb862a242691d4e7c345c (diff) | |
| parent | ce64e5bfd11ae63af0fb10317a2aea6f7501be62 (diff) | |
| download | ffmpeg-3c033d00f5990e48b14f962d33c362f76695fb07.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libopenjpeg: introduce lowres and lowqual private options
FATE: add a test for flac cover art.
cafdec: allow larger ALAC magic cookie
alac: fix channel pointer assignment for 24 and 32-bit
Conflicts:
libavcodec/alac.c
libavcodec/libopenjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
0 files changed, 0 insertions, 0 deletions