[001/132] build: Drop stray mpc8 decoder dependency on dsputil

Message ID 1394544261-545221-2-git-send-email-diego@biurrun.de
State Committed
Commit 88b240646f57a62299c6c4c4d7554f0a80c3a29a
Headers show

Commit Message

Diego Biurrun March 11, 2014, 1:22 p.m.
---
 configure         | 2 +-
 libavcodec/mpc8.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

Comments

Derek Buitenhuis March 11, 2014, 1:27 p.m. | #1
On 3/11/2014 1:22 PM, Diego Biurrun wrote:
> ---
>  configure         | 2 +-
>  libavcodec/mpc8.c | 2 --
>  2 files changed, 1 insertion(+), 3 deletions(-)

OK.

- Derek

Patch

diff --git a/configure b/configure
index 3d1fc29..55ba2ba 100755
--- a/configure
+++ b/configure
@@ -1740,7 +1740,7 @@  mp3float_decoder_select="mpegaudio"
 mp3on4_decoder_select="mpegaudio"
 mp3on4float_decoder_select="mpegaudio"
 mpc7_decoder_select="dsputil mpegaudiodsp"
-mpc8_decoder_select="dsputil mpegaudiodsp"
+mpc8_decoder_select="mpegaudiodsp"
 mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"
 mpeg_xvmc_decoder_select="mpeg2video_decoder"
 mpeg1video_decoder_select="error_resilience mpegvideo"
diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
index b6e0cfd..ee05a93 100644
--- a/libavcodec/mpc8.c
+++ b/libavcodec/mpc8.c
@@ -29,7 +29,6 @@ 
 #include "libavutil/lfg.h"
 #include "avcodec.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "mpegaudiodsp.h"
 
@@ -119,7 +118,6 @@  static av_cold int mpc8_decode_init(AVCodecContext * avctx)
     }
     memset(c->oldDSCF, 0, sizeof(c->oldDSCF));
     av_lfg_init(&c->rnd, 0xDEADBEEF);
-    ff_dsputil_init(&c->dsp, avctx);
     ff_mpadsp_init(&c->mpadsp);
 
     ff_mpc_init();