From c90c39190ee1d522d135ca429df22c8c33c0f2a3 Mon Sep 17 00:00:00 2001 From: Stefan Gehrer Date: Fri, 14 Jul 2006 18:56:17 +0000 Subject: change partition flags SYM -> FWD|SYM Originally committed as revision 5749 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/cavsdata.h | 60 +++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'libavcodec/cavsdata.h') diff --git a/libavcodec/cavsdata.h b/libavcodec/cavsdata.h index eea0b8df0d..0dc6d51fc1 100644 --- a/libavcodec/cavsdata.h +++ b/libavcodec/cavsdata.h @@ -130,36 +130,36 @@ enum mv_loc_t { }; static const uint8_t partition_flags[30] = { - 0, //I_8X8 - 0, //P_SKIP - 0, //P_16X16 - SPLITH, //P_16X8 - SPLITV,//P_8X16 - SPLITH|SPLITV,//P_8X8 - SPLITH|SPLITV,//B_SKIP - SPLITH|SPLITV,//B_DIRECT - 0, //B_FWD_16X16 - 0, //B_BWD_16X16 - 0, //B_SYM_16X16 - FWD0|FWD1|SPLITH, - FWD0|FWD1 |SPLITV, - BWD0|BWD1|SPLITH, - BWD0|BWD1 |SPLITV, - FWD0|BWD1|SPLITH, - FWD0|BWD1 |SPLITV, - BWD0|FWD1|SPLITH, - BWD0|FWD1 |SPLITV, - FWD0|SYM1|SPLITH, - FWD0|SYM1 |SPLITV, - BWD0|SYM1|SPLITH, - BWD0|SYM1 |SPLITV, - SYM0|FWD1|SPLITH, - SYM0|FWD1 |SPLITV, - SYM0|BWD1|SPLITH, - SYM0|BWD1 |SPLITV, - SYM0|SYM1|SPLITH, - SYM0|SYM1 |SPLITV, - SPLITH|SPLITV,//B_8X8 = 29 + 0, //I_8X8 + 0, //P_SKIP + 0, //P_16X16 + SPLITH, //P_16X8 + SPLITV, //P_8X16 + SPLITH|SPLITV, //P_8X8 + SPLITH|SPLITV, //B_SKIP + SPLITH|SPLITV, //B_DIRECT + 0, //B_FWD_16X16 + 0, //B_BWD_16X16 + 0, //B_SYM_16X16 + FWD0|FWD1 |SPLITH, + FWD0|FWD1 |SPLITV, + BWD0|BWD1 |SPLITH, + BWD0|BWD1 |SPLITV, + FWD0|BWD1 |SPLITH, + FWD0|BWD1 |SPLITV, + BWD0|FWD1 |SPLITH, + BWD0|FWD1 |SPLITV, + FWD0|FWD1 |SYM1|SPLITH, + FWD0|FWD1 |SYM1 |SPLITV, + BWD0|FWD1 |SYM1|SPLITH, + BWD0|FWD1 |SYM1 |SPLITV, + FWD0|FWD1|SYM0 |SPLITH, + FWD0|FWD1|SYM0 |SPLITV, + FWD0|BWD1|SYM0 |SPLITH, + FWD0|BWD1|SYM0 |SPLITV, + FWD0|FWD1|SYM0|SYM1|SPLITH, + FWD0|FWD1|SYM0|SYM1 |SPLITV, + SPLITH|SPLITV, //B_8X8 = 29 }; static const uint8_t scan3x3[4] = {4,5,7,8}; -- cgit v1.2.3