apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-05-01 03:56:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

exchange the values of MV_DIR_FORWARD and MV_DIR_BACKWARD (this is more sane,

Browse Source 
matches the order of some other stuff and allows some simplifications)

Originally committed as revision 9864 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2007-08-01 22:12:52 +00:00
parent 04b502fa36
commit 653f738780
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/mpeg12.c
+5 -5
View File
@@ -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;