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/ituh263dec.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/ituh263dec.c')
| -rw-r--r-- | libavcodec/ituh263dec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 39ad781cef..5a61e9c01d 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -238,7 +238,7 @@ int ff_h263_resync(MpegEncContext *s){ if(show_bits(&s->gb, 16)==0){ pos= get_bits_count(&s->gb); if(CONFIG_MPEG4_DECODER && s->codec_id==AV_CODEC_ID_MPEG4) - ret= ff_mpeg4_decode_video_packet_header(s); + ret= ff_mpeg4_decode_video_packet_header(s->avctx->priv_data); else ret= h263_decode_gob_header(s); if(ret>=0) @@ -255,7 +255,7 @@ int ff_h263_resync(MpegEncContext *s){ pos= get_bits_count(&s->gb); if(CONFIG_MPEG4_DECODER && s->codec_id==AV_CODEC_ID_MPEG4) - ret= ff_mpeg4_decode_video_packet_header(s); + ret= ff_mpeg4_decode_video_packet_header(s->avctx->priv_data); else ret= h263_decode_gob_header(s); if(ret>=0) |