aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2007-03-14 14:49:49 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2007-03-14 14:49:49 +0000
commit33a0dd378abd98647700a296e5869146de74ed1c (patch)
tree8ae0c2e7eb6a691b95fcf169043a950d551f76a4 /libavcodec/avcodec.h
parent0769498a9f37c651860e5b90ea65dc92937532ef (diff)
downloadffmpeg-33a0dd378abd98647700a296e5869146de74ed1c.tar.gz
DXA demuxer and decoder
Originally committed as revision 8405 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 1c24dda94c..a2e872f6cc 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -37,8 +37,8 @@ extern "C" {
#define AV_STRINGIFY(s) AV_TOSTRING(s)
#define AV_TOSTRING(s) #s
-#define LIBAVCODEC_VERSION_INT ((51<<16)+(38<<8)+0)
-#define LIBAVCODEC_VERSION 51.38.0
+#define LIBAVCODEC_VERSION_INT ((51<<16)+(39<<8)+0)
+#define LIBAVCODEC_VERSION 51.39.0
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
@@ -150,6 +150,7 @@ enum CodecID {
CODEC_ID_TIFF,
CODEC_ID_GIF,
CODEC_ID_FFH264,
+ CODEC_ID_DXA,
/* various pcm "codecs" */
CODEC_ID_PCM_S16LE= 0x10000,
@@ -2232,6 +2233,7 @@ extern AVCodec dca_decoder;
extern AVCodec dsicinaudio_decoder;
extern AVCodec dsicinvideo_decoder;
extern AVCodec dvvideo_decoder;
+extern AVCodec dxa_decoder;
extern AVCodec eightbps_decoder;
extern AVCodec ffv1_decoder;
extern AVCodec ffvhuff_decoder;