summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg4video_parser.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-11-26 10:41:57 +0100
committerAnton Khirnov <anton@khirnov.net>2013-11-29 14:19:47 +0100
commit35e0833d410e31d9fd35695ad798c5d13de2af58 (patch)
tree8218629859b4cc88c3344f66de5ba25ab4b28581 /libavcodec/mpeg4video_parser.c
parent95fd52c11bff1aad93a29aed3bd5472bd2981d1f (diff)
mpeg4videodec: add a mpeg4-specific private context.
Diffstat (limited to 'libavcodec/mpeg4video_parser.c')
-rw-r--r--libavcodec/mpeg4video_parser.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/mpeg4video_parser.c b/libavcodec/mpeg4video_parser.c
index a8def0e33a..8bad2dfb51 100644
--- a/libavcodec/mpeg4video_parser.c
+++ b/libavcodec/mpeg4video_parser.c
@@ -28,7 +28,7 @@
struct Mp4vParseContext {
ParseContext pc;
- struct MpegEncContext enc;
+ Mpeg4DecContext dec_ctx;
int first_picture;
};
@@ -76,7 +76,8 @@ static int av_mpeg4_decode_header(AVCodecParserContext *s1,
const uint8_t *buf, int buf_size)
{
struct Mp4vParseContext *pc = s1->priv_data;
- MpegEncContext *s = &pc->enc;
+ Mpeg4DecContext *dec_ctx = &pc->dec_ctx;
+ MpegEncContext *s = &dec_ctx->m;
GetBitContext gb1, *gb = &gb1;
int ret;
@@ -106,7 +107,7 @@ static av_cold int mpeg4video_parse_init(AVCodecParserContext *s)
struct Mp4vParseContext *pc = s->priv_data;
pc->first_picture = 1;
- pc->enc.slice_context_count = 1;
+ pc->dec_ctx.m.slice_context_count = 1;
return 0;
}