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/h261dec.c | |
| parent | 8b6cbc3c3319f7942d679d6f6319971c102cfbd3 (diff) | |
| parent | 998c9f15d1ca8c7489775ebcca51623b915988f1 (diff) | |
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/h261dec.c')
| -rw-r--r-- | libavcodec/h261dec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 7e63f29492..9c46f2de23 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -590,10 +590,12 @@ static int h261_decode_frame(AVCodecContext *avctx, void *data, retry: init_get_bits(&s->gb, buf, buf_size * 8); - if (!s->context_initialized) + if (!s->context_initialized) { // we need the IDCT permutaton for reading a custom matrix + ff_mpv_idct_init(s); if (ff_MPV_common_init(s) < 0) return -1; + } ret = h261_decode_picture_header(h); |