From 1a89025793ca73d9685a8ce8e3194efa64dd6844 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 26 Nov 2013 11:23:16 +0100 Subject: mpeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContext --- libavcodec/mpeg4video.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec/mpeg4video.h') diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index eacf0e0963..bda44e6453 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -65,6 +65,7 @@ typedef struct Mpeg4DecContext { ///< number of bits to represent the fractional part of time int time_increment_bits; int shape; + int vol_sprite_usage; } Mpeg4DecContext; /* dc encoding for mpeg4 */ @@ -109,7 +110,7 @@ void ff_mpeg4_stuffing(PutBitContext *pbc); void ff_mpeg4_init_partitions(MpegEncContext *s); void ff_mpeg4_merge_partitions(MpegEncContext *s); void ff_clean_mpeg4_qscales(MpegEncContext *s); -int ff_mpeg4_decode_partitions(MpegEncContext *s); +int ff_mpeg4_decode_partitions(Mpeg4DecContext *ctx); int ff_mpeg4_get_video_packet_prefix_length(MpegEncContext *s); int ff_mpeg4_decode_video_packet_header(Mpeg4DecContext *ctx); void ff_mpeg4_init_direct_mv(MpegEncContext *s); -- cgit v1.2.3