diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-11-26 11:23:16 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-11-29 14:19:47 +0100 |
| commit | ee8af2dd99dcb7a01a667deedec81d1aa2a00d72 (patch) | |
| tree | fd94e38b01629f219d21ed88f9c19bdf6225139a /libavcodec/h263dec.c | |
| parent | 35e0833d410e31d9fd35695ad798c5d13de2af58 (diff) | |
| download | ffmpeg-ee8af2dd99dcb7a01a667deedec81d1aa2a00d72.tar.gz | |
mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext
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 48e67cb658..eea3d13c77 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -442,9 +442,9 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, s->avctx->extradata_size); if (ret < 0) return ret; - 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) { |