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/h263dec.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/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 31ec642e9f..74e4be43a1 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -121,9 +121,11 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) /* for h263, we allocate the images after having read the header */ if (avctx->codec->id != AV_CODEC_ID_H263 && avctx->codec->id != AV_CODEC_ID_H263P && - avctx->codec->id != AV_CODEC_ID_MPEG4) + avctx->codec->id != AV_CODEC_ID_MPEG4) { + ff_mpv_idct_init(s); if ((ret = ff_MPV_common_init(s)) < 0) return ret; + } ff_h263dsp_init(&s->h263dsp); ff_qpeldsp_init(&s->qdsp); @@ -454,10 +456,12 @@ retry: if (ret < 0) return ret; - if (!s->context_initialized) + if (!s->context_initialized) { // we need the idct permutaton for reading a custom matrix + ff_mpv_idct_init(s); if ((ret = ff_MPV_common_init(s)) < 0) return ret; + } /* We need to set current_picture_ptr before reading the header, * otherwise we cannot store anyting in there */ |