[FFmpeg-soc] [soc]: r3955 - in dirac: decoder.diff libavcodec/dirac.c libavcodec/diracdec.c

[conrad]

Author: conrad
Date: Tue Jan 13 07:23:06 2009
New Revision: 3955

Log:
dirac_wavelet.* isn't used in the decoder anymore

Modified:
   dirac/decoder.diff
   dirac/libavcodec/dirac.c
   dirac/libavcodec/diracdec.c

Modified: dirac/decoder.diff
==============================================================================
--- dirac/decoder.diff	Tue Jan 13 07:23:04 2009	(r3954)
+++ dirac/decoder.diff	Tue Jan 13 07:23:06 2009	(r3955)
@@ -1,8 +1,8 @@
 diff --git a/configure b/configure
-index 605bf3f..9842825 100755
+index 8c3cafe..d1b994f 100755
 --- a/configure
 +++ b/configure
-@@ -954,6 +954,7 @@ cavs_decoder_select="golomb"
+@@ -969,6 +969,7 @@ cavs_decoder_select="golomb"
  cook_decoder_select="fft mdct"
  cscd_decoder_suggest="zlib"
  dca_decoder_select="fft mdct"
@@ -11,22 +11,22 @@ index 605bf3f..9842825 100755
  dxa_decoder_select="zlib"
  eac3_decoder_deps="gpl"
 diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index b7cce5f..a001cba 100644
+index f2f544c..069ba73 100644
 --- a/libavcodec/Makefile
 +++ b/libavcodec/Makefile
-@@ -58,6 +58,7 @@ OBJS-$(CONFIG_COOK_DECODER)            += cook.o
+@@ -59,6 +59,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_DIRAC_DECODER)           += diracdec.o dirac.o dirac_arith.o mpeg12data.o dwt.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 d5fe8b5..fc8a12a 100644
+index d1bfff9..e05f5e8 100644
 --- a/libavcodec/allcodecs.c
 +++ b/libavcodec/allcodecs.c
-@@ -74,6 +74,7 @@ void avcodec_register_all(void)
+@@ -64,6 +64,7 @@ void avcodec_register_all(void)
      REGISTER_DECODER (CLJR, cljr);
      REGISTER_DECODER (CSCD, cscd);
      REGISTER_DECODER (CYUV, cyuv);

Modified: dirac/libavcodec/dirac.c
==============================================================================
--- dirac/libavcodec/dirac.c	Tue Jan 13 07:23:04 2009	(r3954)
+++ dirac/libavcodec/dirac.c	Tue Jan 13 07:23:06 2009	(r3955)
@@ -32,7 +32,6 @@
 #include "bytestream.h"
 #include "golomb.h"
 #include "dirac_arith.h"
-#include "dirac_wavelet.h"
 #include "mpeg12data.h"
 
 /* defaults for source parameters */

Modified: dirac/libavcodec/diracdec.c
==============================================================================
--- dirac/libavcodec/diracdec.c	Tue Jan 13 07:23:04 2009	(r3954)
+++ dirac/libavcodec/diracdec.c	Tue Jan 13 07:23:06 2009	(r3955)
@@ -32,7 +32,6 @@
 #include "bytestream.h"
 #include "golomb.h"
 #include "dirac_arith.h"
-#include "dirac_wavelet.h"
 #include "mpeg12data.h"
 #include "dwt.h"