summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/mpeg4data.h
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-04-16 00:18:35 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-04-16 00:18:35 +0000
commit1d0821178b1c27e35595f72bd9adda5945c7be8b (patch)
tree217e2a8eb9c63b36c22f90486752b09fc9aa00ea /src/libffmpeg/libavcodec/mpeg4data.h
parented5ec90442b4dda3918372b43072205fb4ea6167 (diff)
downloadxine-lib-1d0821178b1c27e35595f72bd9adda5945c7be8b.tar.gz
xine-lib-1d0821178b1c27e35595f72bd9adda5945c7be8b.tar.bz2
ffmpeg update, add new files/decoders, use our fastmemcpy
tested ok with usual files (wmv7, mpeg4, divx, svq1...) CVS patchset: 4618 CVS date: 2003/04/16 00:18:35
Diffstat (limited to 'src/libffmpeg/libavcodec/mpeg4data.h')
-rw-r--r--src/libffmpeg/libavcodec/mpeg4data.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libffmpeg/libavcodec/mpeg4data.h b/src/libffmpeg/libavcodec/mpeg4data.h
index fbaca8d5e..bc0d4530e 100644
--- a/src/libffmpeg/libavcodec/mpeg4data.h
+++ b/src/libffmpeg/libavcodec/mpeg4data.h
@@ -27,10 +27,12 @@
#define MOTION_MARKER 0x1F001
#define DC_MARKER 0x6B001
-#define MB_TYPE_B_DIRECT 0
-#define MB_TYPE_B_BIDIR 1
-#define MB_TYPE_B_BACKW 2
-#define MB_TYPE_B_FORW 3
+const static int mb_type_b_map[4]= {
+ MB_TYPE_DIRECT2 | MB_TYPE_L0L1,
+ MB_TYPE_L0L1 | MB_TYPE_16x16,
+ MB_TYPE_L1 | MB_TYPE_16x16,
+ MB_TYPE_L0 | MB_TYPE_16x16,
+};
#define VOS_STARTCODE 0x1B0
#define USER_DATA_STARTCODE 0x1B2