# HG changeset patch
# User banan
# Date 1253640483 0
# Node ID 2ab0e95bc83784f84002bd4aff43fe8508cf8238
# Parent  d884c0b7af2fbccf1132c2da5e6f2eb772d1961d
Hook up the MD studio demuxer and Atrac1 decoder.

diff -r d884c0b7af2f -r 2ab0e95bc837 Makefile
--- 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
diff -r d884c0b7af2f -r 2ab0e95bc837 allcodecs.c
--- 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);
diff -r d884c0b7af2f -r 2ab0e95bc837 avcodec.h
--- 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, \