From a39cd8766fba7d8e4f7c177c13361058d4158ba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Thu, 18 Apr 2013 19:11:04 +0200 Subject: Fix multithreaded MPEG-4 decoding. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Regression since c10d498bfd246a40cc7830838b74e18a79418839. Unfortunately ff_thread_get_format can only be called from a separate decode thread, running it during init will fail. Fixes for that are welcome, for now just revert back to calling avctx->get_format directly, which is correct but having to decide on a case-by-case basis which approach to use is a bit messy. Signed-off-by: Reimar Döffinger --- libavcodec/h263dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec') diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index cc87bc7..405d3c6 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -64,7 +64,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) if (avctx->codec->id == AV_CODEC_ID_MSS2) avctx->pix_fmt = AV_PIX_FMT_YUV420P; else - avctx->pix_fmt = ff_thread_get_format(avctx, avctx->codec->pix_fmts); + avctx->pix_fmt = avctx->get_format(avctx, avctx->codec->pix_fmts); s->unrestricted_mv= 1; /* select sub codec */ -- cgit v1.1