aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2006-02-16 00:09:23 +0000
committerAurelien Jacobs <aurel@gnuage.org>2006-02-16 00:09:23 +0000
commit2433f24f60bc4087907fee57b3b1a8f04b2b37b2 (patch)
treed938e0d3d7a8f76f70cb71815e525680c696ed08 /libavcodec/avcodec.h
parentdcadd216f116b6a4b83d41c0cfe36b3986daae15 (diff)
downloadffmpeg-2433f24f60bc4087907fee57b3b1a8f04b2b37b2.tar.gz
add Creative 8 bits ADPCM schemes support
Originally committed as revision 5024 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 10167d73b6..3e050a9a17 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -21,8 +21,8 @@ extern "C" {
#define AV_STRINGIFY(s) AV_TOSTRING(s)
#define AV_TOSTRING(s) #s
-#define LIBAVCODEC_VERSION_INT ((51<<16)+(5<<8)+0)
-#define LIBAVCODEC_VERSION 51.5.0
+#define LIBAVCODEC_VERSION_INT ((51<<16)+(6<<8)+0)
+#define LIBAVCODEC_VERSION 51.6.0
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
@@ -153,6 +153,9 @@ enum CodecID {
CODEC_ID_ADPCM_CT,
CODEC_ID_ADPCM_SWF,
CODEC_ID_ADPCM_YAMAHA,
+ CODEC_ID_ADPCM_SBPRO_4,
+ CODEC_ID_ADPCM_SBPRO_3,
+ CODEC_ID_ADPCM_SBPRO_2,
/* AMR */
CODEC_ID_AMR_NB= 0x12000,
@@ -2271,6 +2274,9 @@ PCM_CODEC(CODEC_ID_ADPCM_G726, adpcm_g726);
PCM_CODEC(CODEC_ID_ADPCM_CT, adpcm_ct);
PCM_CODEC(CODEC_ID_ADPCM_SWF, adpcm_swf);
PCM_CODEC(CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha);
+PCM_CODEC(CODEC_ID_ADPCM_SBPRO_4, adpcm_sbpro_4);
+PCM_CODEC(CODEC_ID_ADPCM_SBPRO_3, adpcm_sbpro_3);
+PCM_CODEC(CODEC_ID_ADPCM_SBPRO_2, adpcm_sbpro_2);
#undef PCM_CODEC