From 998c9f15d1ca8c7489775ebcca51623b915988f1 Mon Sep 17 00:00:00 2001 From: John Stebbins Date: Fri, 8 Aug 2014 08:11:20 -0700 Subject: idct: remove call to ff_idctdsp_init from ff_MPV_common_init One step in untangling the mpegvideo code and fixing some problems in the order that initialization is being done in h263dec and h261dec. --- libavcodec/h261dec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libavcodec/h261dec.c') diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index d83fb3114c..88ca63ddc6 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -581,10 +581,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); -- cgit v1.2.3