diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 22:35:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 22:35:52 +0100 |
| commit | ad13b8ca9bf5a5cad9cbd4bb36dcd3134d2a2019 (patch) | |
| tree | 43a9d022b3843dd8e4762b9ec777800f7cfcad8d /libavcodec/mpeg4video_parser.c | |
| parent | be0b869b04c049ea00fd178bb4c4fe4b767ed31d (diff) | |
| parent | ee8af2dd99dcb7a01a667deedec81d1aa2a00d72 (diff) | |
| download | ffmpeg-ad13b8ca9bf5a5cad9cbd4bb36dcd3134d2a2019.tar.gz | |
Merge commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72'
* commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72':
mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext
Conflicts:
libavcodec/h263dec.c
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video_parser.c')
| -rw-r--r-- | libavcodec/mpeg4video_parser.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpeg4video_parser.c b/libavcodec/mpeg4video_parser.c index 26a4dd3789..b451517565 100644 --- a/libavcodec/mpeg4video_parser.c +++ b/libavcodec/mpeg4video_parser.c @@ -88,11 +88,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); |