diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-02 21:00:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-02 21:01:10 +0200 |
| commit | 50b0edea9f48c831909313c15b0677957789ff53 (patch) | |
| tree | 9c1dbf2e74e027022cefbba74543b747d8884485 /libavcodec/dsputil.c | |
| parent | 083e65cfd22e44719eedfad4c2d3ed290688661d (diff) | |
| parent | 15616eb04206b64bcf08ad351f4c754e69e00666 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
intrax8: move functions from dsputil to own context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index e30d93ab80..5e4df5dea0 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2967,9 +2967,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) #if CONFIG_MLP_DECODER || CONFIG_TRUEHD_DECODER ff_mlp_init(c, avctx); #endif -#if CONFIG_WMV2_DECODER || CONFIG_VC1_DECODER - ff_intrax8dsp_init(c,avctx); -#endif c->put_mspel_pixels_tab[0]= ff_put_pixels8x8_c; c->put_mspel_pixels_tab[1]= put_mspel8_mc10_c; |