diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-02 22:25:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-02 23:34:01 +0200 |
| commit | 9c6e23f5d2f9fa58d54adf35b4cde4e351fb7d64 (patch) | |
| tree | 51e742dd00ad34c80a40e60e8fa4ff7a05adef8f /libavcodec/avcodec.h | |
| parent | 9f14cd91b5195e2beba7213e855c0d36b787ab85 (diff) | |
| parent | c728518b3cbb0daf0d0a65ba7adfcb48c5629b93 (diff) | |
| download | ffmpeg-9c6e23f5d2f9fa58d54adf35b4cde4e351fb7d64.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: fft: fix imdct_half() for AVX
rtmppkt: Add missing libavcodec/bytestream.h include.
rtmp: add functions for reading AMF values
vc1dec: remove useless #include simple_idct.h
dct-test: always link with aandcttab.o
vp8: pack struct VP8ThreadData more efficiently
x86: remove libmpeg2 mmx(ext) idct functions
eamad: Use dsputils instead of a custom bswap16_buf
Canopus Lossless decoder
Conflicts:
Changelog
LICENSE
libavcodec/avcodec.h
libavcodec/cllc.c
libavcodec/eamad.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7a7400d6c6..cd933fd7cb 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -261,6 +261,7 @@ enum CodecID { CODEC_ID_MSA1, CODEC_ID_TSCC2, CODEC_ID_MTS2, + CODEC_ID_CLLC, CODEC_ID_Y41P = MKBETAG('Y','4','1','P'), CODEC_ID_ESCAPE130 = MKBETAG('E','1','3','0'), CODEC_ID_EXR = MKBETAG('0','E','X','R'), @@ -274,7 +275,6 @@ enum CodecID { CODEC_ID_YUV4 = MKBETAG('Y','U','V','4'), CODEC_ID_SANM = MKBETAG('S','A','N','M'), CODEC_ID_PAF_VIDEO = MKBETAG('P','A','F','V'), - CODEC_ID_CLLC = MKBETAG('C','L','L','C'), /* various PCM "codecs" */ CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs |