Commit 9eaa4690 authored by Juanjo's avatar Juanjo

- Bug fixed on H.263 decoder initialization.

Originally committed as revision 220 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 21810797
...@@ -113,13 +113,18 @@ static int h263_decode_frame(AVCodecContext *avctx, ...@@ -113,13 +113,18 @@ static int h263_decode_frame(AVCodecContext *avctx,
ret = intel_h263_decode_picture_header(s); ret = intel_h263_decode_picture_header(s);
} else { } else {
ret = h263_decode_picture_header(s); ret = h263_decode_picture_header(s);
/* After H263 header decode we have the height, width, */ /* After H263 header decode we have the height, width, */
/* and other parameters. So then we could init the picture */ /* and other parameters. So then we could init the picture */
if (s->width != avctx->width || s->height != avctx->height) { /* FIXME: By the way H263 decoder is evolving it should have */
/* an H263EncContext */
if (!s->context_initialized) {
avctx->width = s->width; avctx->width = s->width;
avctx->height = s->height; avctx->height = s->height;
/* FIXME: By the way H263 decoder is evolving it should have */ if (MPV_common_init(s) < 0)
/* an H263EncContext */ return -1;
} else if (s->width != avctx->width || s->height != avctx->height) {
/* H.263 could change picture size any time */
MPV_common_end(s);
if (MPV_common_init(s) < 0) if (MPV_common_init(s) < 0)
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment