[FFmpeg-soc] [soc]: r3799 - dirac/decoder.diff

[conrad]

Author: conrad
Date: Mon Nov 10 04:12:13 2008
New Revision: 3799

Log:
Updated patch to enable the decoder in SVN head


Added:
   dirac/decoder.diff

Added: dirac/decoder.diff
==============================================================================
--- (empty file)
+++ dirac/decoder.diff	Mon Nov 10 04:12:13 2008
@@ -0,0 +1,36 @@
+diff --git a/configure b/configure
+index d633444..ff3c83d 100755
+--- a/configure
++++ b/configure
+@@ -929,6 +929,7 @@ cavs_decoder_select="golomb"
+ cook_decoder_select="fft mdct"
+ cscd_decoder_suggest="zlib"
+ dca_decoder_select="fft mdct"
++dirac_decoder_select="golomb"
+ dxa_decoder_select="zlib"
+ eac3_decoder_deps="gpl"
+ eac3_decoder_select="fft mdct"
+diff --git a/libavcodec/Makefile b/libavcodec/Makefile
+index 0540c20..ff607c2 100644
+--- a/libavcodec/Makefile
++++ b/libavcodec/Makefile
+@@ -55,6 +55,7 @@ OBJS-$(CONFIG_COOK_DECODER)            += cook.o
+ OBJS-$(CONFIG_CSCD_DECODER)            += cscd.o
+ OBJS-$(CONFIG_CYUV_DECODER)            += cyuv.o
+ OBJS-$(CONFIG_DCA_DECODER)             += dca.o
++OBJS-$(CONFIG_DIRAC_DECODER)           += diracdec.o dirac.o dirac_arith.o dirac_wavelet.o mpeg12data.o
+ OBJS-$(CONFIG_DNXHD_DECODER)           += dnxhddec.o dnxhddata.o
+ OBJS-$(CONFIG_DNXHD_ENCODER)           += dnxhdenc.o dnxhddata.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o
+ OBJS-$(CONFIG_DSICINAUDIO_DECODER)     += dsicinav.o
+diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
+index f8f7a71..37d369e 100644
+--- a/libavcodec/allcodecs.c
++++ b/libavcodec/allcodecs.c
+@@ -74,6 +74,7 @@ void avcodec_register_all(void)
+     REGISTER_DECODER (CLJR, cljr);
+     REGISTER_DECODER (CSCD, cscd);
+     REGISTER_DECODER (CYUV, cyuv);
++    REGISTER_DECODER (DIRAC, dirac);
+     REGISTER_ENCDEC  (DNXHD, dnxhd);
+     REGISTER_DECODER (DSICINVIDEO, dsicinvideo);
+     REGISTER_ENCDEC  (DVVIDEO, dvvideo);