diff options
| author | Stefan Gehrer <stefan.gehrer@gmx.de> | 2006-07-14 18:56:17 +0000 |
|---|---|---|
| committer | Stefan Gehrer <stefan.gehrer@gmx.de> | 2006-07-14 18:56:17 +0000 |
| commit | c90c39190ee1d522d135ca429df22c8c33c0f2a3 (patch) | |
| tree | f13fb0e1b39991214914e5c7d2353baa0d43307d /libavcodec/cavs.c | |
| parent | 77f173bef53b670fa268e0fcfa7d5da6cc300078 (diff) | |
change partition flags SYM -> FWD|SYM
Originally committed as revision 5749 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/cavs.c')
| -rw-r--r-- | libavcodec/cavs.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index 9feb69fe6d..60826f717c 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -1037,16 +1037,12 @@ static void decode_mb_b(AVSContext *h, enum mb_t mb_type) { if(mb_type & 1) { /* 16x8 macroblock types */ if(flags & FWD0) mv_pred(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_TOP, BLK_16X8, 1); - if(flags & SYM0) { - mv_pred(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_TOP, BLK_16X8, 1); + if(flags & SYM0) mv_pred_sym(h, &h->mv[MV_FWD_X0], BLK_16X8); - } if(flags & FWD1) mv_pred(h, MV_FWD_X2, MV_FWD_A1, MV_PRED_LEFT, BLK_16X8, 1); - if(flags & SYM1) { - mv_pred(h, MV_FWD_X2, MV_FWD_A1, MV_PRED_LEFT, BLK_16X8, 1); - mv_pred_sym(h, &h->mv[9], BLK_16X8); - } + if(flags & SYM1) + mv_pred_sym(h, &h->mv[MV_FWD_X2], BLK_16X8); if(flags & BWD0) mv_pred(h, MV_BWD_X0, MV_BWD_C2, MV_PRED_TOP, BLK_16X8, 0); if(flags & BWD1) @@ -1054,16 +1050,12 @@ static void decode_mb_b(AVSContext *h, enum mb_t mb_type) { } else { /* 8x16 macroblock types */ if(flags & FWD0) mv_pred(h, MV_FWD_X0, MV_FWD_B3, MV_PRED_LEFT, BLK_8X16, 1); - if(flags & SYM0) { - mv_pred(h, MV_FWD_X0, MV_FWD_B3, MV_PRED_LEFT, BLK_8X16, 1); + if(flags & SYM0) mv_pred_sym(h, &h->mv[MV_FWD_X0], BLK_8X16); - } if(flags & FWD1) mv_pred(h, MV_FWD_X1, MV_FWD_C2, MV_PRED_TOPRIGHT,BLK_8X16, 1); - if(flags & SYM1) { - mv_pred(h, MV_FWD_X1, MV_FWD_C2, MV_PRED_TOPRIGHT,BLK_8X16, 1); - mv_pred_sym(h, &h->mv[6], BLK_8X16); - } + if(flags & SYM1) + mv_pred_sym(h, &h->mv[MV_FWD_X1], BLK_8X16); if(flags & BWD0) mv_pred(h, MV_BWD_X0, MV_BWD_B3, MV_PRED_LEFT, BLK_8X16, 0); if(flags & BWD1) |