summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/mpeg4data.h
diff options
context:
space:
mode:
authorGuenter Bartsch <guenter@users.sourceforge.net>2002-03-12 00:40:52 +0000
committerGuenter Bartsch <guenter@users.sourceforge.net>2002-03-12 00:40:52 +0000
commit0bf7e08a076a9d88acaebcf6bbed63e090ff6857 (patch)
tree17001793feff338449d34ef8e8ff89d8dcb0ebad /src/libffmpeg/libavcodec/mpeg4data.h
parent0e27a3976b6b5eaab4983b3e63a7009fe77451cf (diff)
downloadxine-lib-0bf7e08a076a9d88acaebcf6bbed63e090ff6857.tar.gz
xine-lib-0bf7e08a076a9d88acaebcf6bbed63e090ff6857.tar.bz2
updated ffmpeg to the latest ffmpeg-cvs, hopefully this will handle divx5 files
CVS patchset: 1558 CVS date: 2002/03/12 00:40:52
Diffstat (limited to 'src/libffmpeg/libavcodec/mpeg4data.h')
-rw-r--r--src/libffmpeg/libavcodec/mpeg4data.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/libffmpeg/libavcodec/mpeg4data.h b/src/libffmpeg/libavcodec/mpeg4data.h
index 3821a591c..4eed75654 100644
--- a/src/libffmpeg/libavcodec/mpeg4data.h
+++ b/src/libffmpeg/libavcodec/mpeg4data.h
@@ -1,3 +1,15 @@
+// shapes
+#define RECT_SHAPE 0
+#define BIN_SHAPE 1
+#define BIN_ONLY_SHAPE 2
+#define GRAY_SHAPE 3
+
+// aspect_ratio_info
+#define EXTENDET_PAR 15
+
+//vol_sprite_usage / sprite_enable
+#define STATIC_SPRITE 1
+#define GMC_SPRITE 2
/* dc encoding for mpeg4 */
static const UINT8 DCtab_lum[13][2] =
@@ -81,3 +93,9 @@ static RLTable rl_intra = {
intra_run,
intra_level,
};
+
+static const UINT16 sprite_trajectory_tab[15][2] = {
+ {0x00, 2}, {0x02, 3}, {0x03, 3}, {0x04, 3}, {0x05, 3}, {0x06, 3},
+ {0x0E, 4}, {0x1E, 5}, {0x3E, 6}, {0x7E, 7}, {0xFE, 8},
+ {0x1FE, 9},{0x3FE, 10},{0x7FE, 11},{0xFFE, 12},
+};