diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 23:04:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 23:04:26 +0100 |
| commit | 68c90fc086fec90df374d0765985cb324986e8b4 (patch) | |
| tree | 1cfa71f019d53542cbb401064d43970c9a39f154 /libavcodec/h263dec.c | |
| parent | f602e22122473a8b717affc503583a42bccf0be9 (diff) | |
| parent | 1a89025793ca73d9685a8ce8e3194efa64dd6844 (diff) | |
| download | ffmpeg-68c90fc086fec90df374d0765985cb324986e8b4.tar.gz | |
Merge commit '1a89025793ca73d9685a8ce8e3194efa64dd6844'
* commit '1a89025793ca73d9685a8ce8e3194efa64dd6844':
mpeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 07031b6fb7..8daa6b9a98 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -193,7 +193,7 @@ static int decode_slice(MpegEncContext *s) const int qscale = s->qscale; if (CONFIG_MPEG4_DECODER && s->codec_id == AV_CODEC_ID_MPEG4) - if ((ret = ff_mpeg4_decode_partitions(s)) < 0) + if ((ret = ff_mpeg4_decode_partitions(s->avctx->priv_data)) < 0) return ret; /* restore variables which were modified */ |