diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-11-26 10:41:57 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-11-29 14:19:47 +0100 |
| commit | 35e0833d410e31d9fd35695ad798c5d13de2af58 (patch) | |
| tree | 8218629859b4cc88c3344f66de5ba25ab4b28581 /libavcodec/mpeg4videodec.c | |
| parent | 95fd52c11bff1aad93a29aed3bd5472bd2981d1f (diff) | |
| download | ffmpeg-35e0833d410e31d9fd35695ad798c5d13de2af58.tar.gz | |
mpeg4videodec: add a mpeg4-specific private context.
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 59aadd7b6e..23e5583bfe 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2397,9 +2397,24 @@ end: return decode_vop_header(s, gb); } +static int mpeg4_update_thread_context(AVCodecContext *dst, + const AVCodecContext *src) +{ + Mpeg4DecContext *s = dst->priv_data; + const Mpeg4DecContext *s1 = src->priv_data; + + int ret = ff_mpeg_update_thread_context(dst, src); + + if (ret < 0) + return ret; + + return 0; +} + static av_cold int decode_init(AVCodecContext *avctx) { - MpegEncContext *s = avctx->priv_data; + Mpeg4DecContext *ctx = avctx->priv_data; + MpegEncContext *s = &ctx->m; int ret; static int done = 0; @@ -2469,7 +2484,7 @@ AVCodec ff_mpeg4_decoder = { .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG4, - .priv_data_size = sizeof(MpegEncContext), + .priv_data_size = sizeof(Mpeg4DecContext), .init = decode_init, .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, @@ -2479,5 +2494,5 @@ AVCodec ff_mpeg4_decoder = { .flush = ff_mpeg_flush, .pix_fmts = ff_h263_hwaccel_pixfmt_list_420, .profiles = NULL_IF_CONFIG_SMALL(mpeg4_video_profiles), - .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_mpeg_update_thread_context), + .update_thread_context = ONLY_IF_THREADS_ENABLED(mpeg4_update_thread_context), }; |