diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-11-26 11:23:16 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-11-29 14:19:47 +0100 |
| commit | ee8af2dd99dcb7a01a667deedec81d1aa2a00d72 (patch) | |
| tree | fd94e38b01629f219d21ed88f9c19bdf6225139a /libavcodec/mpeg4video.h | |
| parent | 35e0833d410e31d9fd35695ad798c5d13de2af58 (diff) | |
mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext
Diffstat (limited to 'libavcodec/mpeg4video.h')
| -rw-r--r-- | libavcodec/mpeg4video.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index 443fc71f22..08daa2dc72 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -61,6 +61,8 @@ typedef struct Mpeg4DecContext { MpegEncContext m; + + int shape; } Mpeg4DecContext; /* dc encoding for mpeg4 */ @@ -98,7 +100,7 @@ void ff_mpeg4_pred_ac(MpegEncContext *s, int16_t *block, int n, void ff_set_mpeg4_time(MpegEncContext *s); void ff_mpeg4_encode_picture_header(MpegEncContext *s, int picture_number); -int ff_mpeg4_decode_picture_header(MpegEncContext *s, GetBitContext *gb); +int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb); void ff_mpeg4_encode_video_packet_header(MpegEncContext *s); void ff_mpeg4_clean_buffers(MpegEncContext *s); void ff_mpeg4_stuffing(PutBitContext *pbc); @@ -107,7 +109,7 @@ void ff_mpeg4_merge_partitions(MpegEncContext *s); void ff_clean_mpeg4_qscales(MpegEncContext *s); int ff_mpeg4_decode_partitions(MpegEncContext *s); int ff_mpeg4_get_video_packet_prefix_length(MpegEncContext *s); -int ff_mpeg4_decode_video_packet_header(MpegEncContext *s); +int ff_mpeg4_decode_video_packet_header(Mpeg4DecContext *ctx); void ff_mpeg4_init_direct_mv(MpegEncContext *s); /** |