summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg4video.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-29 22:35:52 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-29 22:35:52 +0100
commitad13b8ca9bf5a5cad9cbd4bb36dcd3134d2a2019 (patch)
tree43a9d022b3843dd8e4762b9ec777800f7cfcad8d /libavcodec/mpeg4video.h
parentbe0b869b04c049ea00fd178bb4c4fe4b767ed31d (diff)
parentee8af2dd99dcb7a01a667deedec81d1aa2a00d72 (diff)
Merge commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72'
* commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72': mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext Conflicts: libavcodec/h263dec.c libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video.h')
-rw-r--r--libavcodec/mpeg4video.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h
index 1f064c84ed..16860fac17 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);
void ff_mpeg4videodec_static_init(void);