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/h263dec.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/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index b91d8d5145..07031b6fb7 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -464,9 +464,9 @@ retry: GetBitContext gb; if (init_get_bits8(&gb, s->avctx->extradata, s->avctx->extradata_size) >= 0 ) - ff_mpeg4_decode_picture_header(s, &gb); + ff_mpeg4_decode_picture_header(avctx->priv_data, &gb); } - ret = ff_mpeg4_decode_picture_header(s, &s->gb); + ret = ff_mpeg4_decode_picture_header(avctx->priv_data, &s->gb); } else if (CONFIG_H263I_DECODER && s->codec_id == AV_CODEC_ID_H263I) { ret = ff_intel_h263_decode_picture_header(s); } else if (CONFIG_FLV_DECODER && s->h263_flv) { |