changeset 10226:2ab0e95bc837 libavcodec

Hook up the MD studio demuxer and Atrac1 decoder.
author banan
date Tue, 22 Sep 2009 17:28:03 +0000
parents d884c0b7af2f
children bfef610ab83c
files Makefile allcodecs.c avcodec.h
diffstat 3 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Sep 22 17:05:19 2009 +0000
+++ b/Makefile	Tue Sep 22 17:28:03 2009 +0000
@@ -48,6 +48,7 @@
 OBJS-$(CONFIG_ASV1_ENCODER)            += asv1.o mpeg12data.o
 OBJS-$(CONFIG_ASV2_DECODER)            += asv1.o mpeg12data.o
 OBJS-$(CONFIG_ASV2_ENCODER)            += asv1.o mpeg12data.o
+OBJS-$(CONFIG_ATRAC1_DECODER)          += atrac1.o atrac.o
 OBJS-$(CONFIG_ATRAC3_DECODER)          += atrac3.o atrac.o
 OBJS-$(CONFIG_AVS_DECODER)             += avs.o
 OBJS-$(CONFIG_BETHSOFTVID_DECODER)     += bethsoftvideo.o
--- a/allcodecs.c	Tue Sep 22 17:05:19 2009 +0000
+++ b/allcodecs.c	Tue Sep 22 17:28:03 2009 +0000
@@ -199,6 +199,7 @@
     REGISTER_ENCDEC  (AC3, ac3);
     REGISTER_ENCDEC  (ALAC, alac);
     REGISTER_DECODER (APE, ape);
+    REGISTER_DECODER (ATRAC1, atrac1);
     REGISTER_DECODER (ATRAC3, atrac3);
     REGISTER_DECODER (COOK, cook);
     REGISTER_DECODER (DCA, dca);
--- a/avcodec.h	Tue Sep 22 17:05:19 2009 +0000
+++ b/avcodec.h	Tue Sep 22 17:28:03 2009 +0000
@@ -30,7 +30,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 35
+#define LIBAVCODEC_VERSION_MINOR 36
 #define LIBAVCODEC_VERSION_MICRO  0
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \