generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext

Browse Source
This commit is contained in:
Anton Khirnov
2013-11-26 11:23:16 +01:00
parent 35e0833d41
commit ee8af2dd99
7 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpeg4video_parser.c
View File

@@ -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);