[SCM] libav/experimental: h261dec: Fix order of initialization
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Aug 30 15:49:52 UTC 2014
The following commit has been merged in the experimental branch:
commit 552bc42df48784ae3ce0d499ece5b33f3cc7576a
Author: John Stebbins <stebbins at jetheaddev.com>
Date: Fri Aug 8 08:55:48 2014 -0700
h261dec: Fix order of initialization
ff_MPV_common_init requires the frame dimensions which get parsed in
h261_decode_picture_header.
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index 88ca63d..6b358a6 100644
--- a/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@@ -581,12 +581,9 @@ 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);
@@ -602,6 +599,11 @@ retry:
ff_MPV_common_end(s);
s->parse_context = pc;
}
+
+ if (!s->context_initialized)
+ if ((ret = ff_MPV_common_init(s)) < 0)
+ return ret;
+
if (!s->context_initialized) {
ret = ff_set_dimensions(avctx, s->width, s->height);
if (ret < 0)
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list