From 7bc9090a4176de2bc834e2a7df131047b944f3b5 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 10 Apr 2003 13:18:38 +0000 Subject: simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture more direct use of the new mb_type stuff instead of codec specific stuff runtime mb_type debug output h264/h263 variants/mpeg1/2/4 error concealment /resilience for mpeg1/2 various minor optimizations Originally committed as revision 1746 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpeg4data.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'libavcodec/mpeg4data.h') diff --git a/libavcodec/mpeg4data.h b/libavcodec/mpeg4data.h index fbaca8d5e2..bc0d4530e1 100644 --- a/libavcodec/mpeg4data.h +++ b/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 -- cgit v1.2.3