diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 21:06:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 21:06:42 +0100 |
| commit | 4b50de88a4c07143cff1030fe740ac4352c3632c (patch) | |
| tree | a732b1e457c9e5e3c64216c69c5c28d0fea35782 | |
| parent | a47dfdfa7dcfe952b65140de6dccf849a103cc8e (diff) | |
| parent | 88b240646f57a62299c6c4c4d7554f0a80c3a29a (diff) | |
| download | ffmpeg-streaming-4b50de88a4c07143cff1030fe740ac4352c3632c.zip ffmpeg-streaming-4b50de88a4c07143cff1030fe740ac4352c3632c.tar.gz | |
Merge commit '88b240646f57a62299c6c4c4d7554f0a80c3a29a'
* commit '88b240646f57a62299c6c4c4d7554f0a80c3a29a':
build: Drop stray mpc8 decoder dependency on dsputil
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/mpc8.c | 2 |
2 files changed, 1 insertions, 3 deletions
@@ -2005,7 +2005,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 2f58805..29c65f9 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(); |
