diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2013-04-18 19:11:04 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2013-04-19 01:26:54 +0200 |
| commit | a39cd8766fba7d8e4f7c177c13361058d4158ba0 (patch) | |
| tree | d4ec0060a3f722f563763205cc5e47dc593ba657 | |
| parent | 7254afdf1c60f2786ff1f2a89e090f6c016ab85d (diff) | |
| download | ffmpeg-a39cd8766fba7d8e4f7c177c13361058d4158ba0.tar.gz | |
Fix multithreaded MPEG-4 decoding.
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 <Reimar.Doeffinger@gmx.de>
| -rw-r--r-- | libavcodec/h263dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index cc87bc7dee..405d3c68fd 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 */ |