summaryrefslogtreecommitdiff
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorStefan Gehrer <stefan.gehrer@gmx.de>2009-01-17 20:08:43 +0000
committerStefan Gehrer <stefan.gehrer@gmx.de>2009-01-17 20:08:43 +0000
commit055dc116fcf75f7f38c64b689ebda7480a7da8c2 (patch)
treec6b232602cbfb4b536f0f46b194fa21e3bdc80a1 /libavcodec/avcodec.h
parent8a569fee99eba28d3e993182c89a797c455a3bd6 (diff)
added demuxer for FunCom ISS audio files,
extended ADPCM decoder by ISS specific IMA variant Originally committed as revision 16658 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 4fa2f1ee14..958ba8c30d 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -30,7 +30,7 @@
#include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 10
+#define LIBAVCODEC_VERSION_MINOR 11
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@@ -245,6 +245,7 @@ enum CodecID {
CODEC_ID_ADPCM_IMA_EA_EACS,
CODEC_ID_ADPCM_EA_XAS,
CODEC_ID_ADPCM_EA_MAXIS_XA,
+ CODEC_ID_ADPCM_IMA_ISS,
/* AMR */
CODEC_ID_AMR_NB= 0x12000,