From ee8af2dd99dcb7a01a667deedec81d1aa2a00d72 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 26 Nov 2013 11:23:16 +0100 Subject: mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext --- libavcodec/mpeg4video_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/mpeg4video_parser.c') diff --git a/libavcodec/mpeg4video_parser.c b/libavcodec/mpeg4video_parser.c index 8bad2dfb51..a5689aa9d2 100644 --- a/libavcodec/mpeg4video_parser.c +++ b/libavcodec/mpeg4video_parser.c @@ -86,11 +86,11 @@ static int av_mpeg4_decode_header(AVCodecParserContext *s1, if (avctx->extradata_size && pc->first_picture) { init_get_bits(gb, avctx->extradata, avctx->extradata_size * 8); - ret = ff_mpeg4_decode_picture_header(s, gb); + ret = ff_mpeg4_decode_picture_header(dec_ctx, gb); } init_get_bits(gb, buf, 8 * buf_size); - ret = ff_mpeg4_decode_picture_header(s, gb); + ret = ff_mpeg4_decode_picture_header(dec_ctx, gb); if (s->width && (!avctx->width || !avctx->height || !avctx->coded_width || !avctx->coded_height)) { ret = ff_set_dimensions(avctx, s->width, s->height); -- cgit v1.2.3