diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-08-01 22:12:52 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-08-01 22:12:52 +0000 |
| commit | 653f738780035025ee4360757c5ad071ee82bedb (patch) | |
| tree | c6d62e31bd8cbf8b3e5211ee391fd9a0b5ed7267 /libavcodec/mpeg12.c | |
| parent | 04b502fa368e40835d8e2b3a15245d53541fa742 (diff) | |
| download | ffmpeg-653f738780035025ee4360757c5ad071ee82bedb.tar.gz | |
exchange the values of MV_DIR_FORWARD and MV_DIR_BACKWARD (this is more sane,
matches the order of some other stuff and allows some simplifications)
Originally committed as revision 9864 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 73f3a85b9d..afc3ed4044 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -383,7 +383,7 @@ static int mpeg_decode_mb(MpegEncContext *s, s->mv_type = MV_TYPE_16X16; for(i=0;i<2;i++) { if (USES_LIST(mb_type, i)) { - s->mv_dir |= (MV_DIR_FORWARD >> i); + s->mv_dir |= (MV_DIR_FORWARD << i); /* MT_FRAME */ s->mv[i][0][0]= s->last_mv[i][0][0]= s->last_mv[i][1][0] = mpeg_decode_motion(s, s->mpeg_f_code[i][0], s->last_mv[i][0][0]); @@ -401,7 +401,7 @@ static int mpeg_decode_mb(MpegEncContext *s, s->mv_type = MV_TYPE_16X8; for(i=0;i<2;i++) { if (USES_LIST(mb_type, i)) { - s->mv_dir |= (MV_DIR_FORWARD >> i); + s->mv_dir |= (MV_DIR_FORWARD << i); /* MT_16X8 */ for(j=0;j<2;j++) { s->field_select[i][j] = get_bits1(&s->gb); @@ -422,7 +422,7 @@ static int mpeg_decode_mb(MpegEncContext *s, mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED; for(i=0;i<2;i++) { if (USES_LIST(mb_type, i)) { - s->mv_dir |= (MV_DIR_FORWARD >> i); + s->mv_dir |= (MV_DIR_FORWARD << i); for(j=0;j<2;j++) { s->field_select[i][j] = get_bits1(&s->gb); val = mpeg_decode_motion(s, s->mpeg_f_code[i][0], @@ -442,7 +442,7 @@ static int mpeg_decode_mb(MpegEncContext *s, mb_type |= MB_TYPE_16x16 | MB_TYPE_INTERLACED; for(i=0;i<2;i++) { if (USES_LIST(mb_type, i)) { - s->mv_dir |= (MV_DIR_FORWARD >> i); + s->mv_dir |= (MV_DIR_FORWARD << i); s->field_select[i][0] = get_bits1(&s->gb); for(k=0;k<2;k++) { val = mpeg_decode_motion(s, s->mpeg_f_code[i][k], @@ -460,7 +460,7 @@ static int mpeg_decode_mb(MpegEncContext *s, for(i=0;i<2;i++) { if (USES_LIST(mb_type, i)) { int dmx, dmy, mx, my, m; - s->mv_dir |= (MV_DIR_FORWARD >> i); + s->mv_dir |= (MV_DIR_FORWARD << i); mx = mpeg_decode_motion(s, s->mpeg_f_code[i][0], s->last_mv[i][0][0]); s->last_mv[i][0][0] = mx; |