diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 13:35:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 13:35:49 +0100 |
| commit | 60a0bc46cdba5f13d557624d3448628328ad0fb0 (patch) | |
| tree | 65788b23d15f155b742e5fd6d85e10c601f1d772 /libavcodec/rv34.c | |
| parent | c4e394e46008c9e208f666d156f49f7ba500d73a (diff) | |
| parent | a846dccb29d2bb0798af1d47d06100eda9ca87cc (diff) | |
| download | ffmpeg-60a0bc46cdba5f13d557624d3448628328ad0fb0.tar.gz | |
Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'
* commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc':
h264chroma: x86: Fix building with yasm disabled
rv34: Drop now unnecessary dsputil dependencies
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv34.c')
| -rw-r--r-- | libavcodec/rv34.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 7a9778a101..eb431ee1e2 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1495,11 +1495,11 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx) #if CONFIG_RV30_DECODER if (avctx->codec_id == AV_CODEC_ID_RV30) - ff_rv30dsp_init(&r->rdsp, &r->s.dsp); + ff_rv30dsp_init(&r->rdsp); #endif #if CONFIG_RV40_DECODER if (avctx->codec_id == AV_CODEC_ID_RV40) - ff_rv40dsp_init(&r->rdsp, &r->s.dsp); + ff_rv40dsp_init(&r->rdsp); #endif if ((ret = rv34_decoder_alloc(r)) < 0) |