diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-12 02:50:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-12 02:50:25 +0100 |
| commit | 29582df797745fa6c5eec22b007e4fd3a47e7dd9 (patch) | |
| tree | 59c487e218e4f750b48151d548db9091236d096f /libavformat/aiff.h | |
| parent | 6761b6b825c4aafff311a180a09c7013288480aa (diff) | |
| parent | 29ae0565d98bb41e54fc74f74c330d3214825f47 (diff) | |
| download | ffmpeg-29582df797745fa6c5eec22b007e4fd3a47e7dd9.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vble: remove vble_error_close
VBLE Decoder
tta: use an integer instead of a pointer to iterate output samples
shorten: do not modify samples pointer when interleaving
mpc7: only support stereo input.
dpcm: do not try to decode empty packets
dpcm: remove unneeded buf_size==0 check.
twinvq: add SSE/AVX optimized sum/difference stereo interleaving
vqf/twinvq: pass vqf COMM chunk info in extradata
vqf: do not set bits_per_coded_sample for TwinVQ.
twinvq: check for allocation failure in init_mdct_win()
swscale: add padding to conversion buffer.
rtpdec: Simplify finalize_packet
http: Handle proxy authentication
http: Print an error message for Authorization Required, too
AVOptions: don't return an invalid option when option list is empty
AIFF: add 'twos' FourCC for the mux/demuxer (big endian PCM audio)
Conflicts:
libavcodec/avcodec.h
libavcodec/tta.c
libavcodec/vble.c
libavcodec/version.h
libavutil/opt.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aiff.h')
| -rw-r--r-- | libavformat/aiff.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/aiff.h b/libavformat/aiff.h index 047f81dc1d..d909bdd83e 100644 --- a/libavformat/aiff.h +++ b/libavformat/aiff.h @@ -43,6 +43,7 @@ static const AVCodecTag ff_codec_aiff_tags[] = { { CODEC_ID_MACE6, MKTAG('M','A','C','6') }, { CODEC_ID_GSM, MKTAG('G','S','M',' ') }, { CODEC_ID_ADPCM_G726, MKTAG('G','7','2','6') }, + { CODEC_ID_PCM_S16BE, MKTAG('t','w','o','s') }, { CODEC_ID_PCM_S16LE, MKTAG('s','o','w','t') }, { CODEC_ID_ADPCM_IMA_QT, MKTAG('i','m','a','4') }, { CODEC_ID_QDM2, MKTAG('Q','D','M','2') }, |