diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 02:08:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 02:25:14 +0200 |
| commit | 2fd87a3d7895ce36e558a306d03e33697d456086 (patch) | |
| tree | 99a9b5ef8a07475a55d89050993a0071e9ea4008 /libavcodec/rv34.c | |
| parent | 8b6cbc3c3319f7942d679d6f6319971c102cfbd3 (diff) | |
| parent | 998c9f15d1ca8c7489775ebcca51623b915988f1 (diff) | |
| download | ffmpeg-2fd87a3d7895ce36e558a306d03e33697d456086.tar.gz | |
Merge commit '998c9f15d1ca8c7489775ebcca51623b915988f1'
* commit '998c9f15d1ca8c7489775ebcca51623b915988f1':
idct: remove call to ff_idctdsp_init from ff_MPV_common_init
Conflicts:
libavcodec/dnxhdenc.c
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv34.c')
| -rw-r--r-- | libavcodec/rv34.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index d82b41e2a0..19e4ce024b 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1502,6 +1502,7 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx) avctx->has_b_frames = 1; s->low_delay = 0; + ff_mpv_idct_init(s); if ((ret = ff_MPV_common_init(s)) < 0) return ret; @@ -1538,6 +1539,7 @@ int ff_rv34_decode_init_thread_copy(AVCodecContext *avctx) if (avctx->internal->is_copy) { r->tmp_b_block_base = NULL; + ff_mpv_idct_init(&r->s); if ((err = ff_MPV_common_init(&r->s)) < 0) return err; if ((err = rv34_decoder_alloc(r)) < 0) { |