Mercurial > libavcodec.hg

changeset 10600:40af8390d83f libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix dual prime motion compensation in field pictures. Fixes issue1125.
author michael
date Mon, 30 Nov 2009 02:37:03 +0000
parents f2a8cba717b0
children 5bf8c18a9907
files mpeg12.c
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mpeg12.c	Sun Nov 29 23:01:29 2009 +0000
+++ b/mpeg12.c	Mon Nov 30 02:37:03 2009 +0000
@@ -448,18 +448,20 @@
                 for(i=0;i<2;i++) {
                     if (USES_LIST(mb_type, i)) {
                         int dmx, dmy, mx, my, m;
+                        const int my_shift= s->picture_structure == PICT_FRAME;
+
                         mx = mpeg_decode_motion(s, s->mpeg_f_code[i][0],
                                                 s->last_mv[i][0][0]);
                         s->last_mv[i][0][0] = mx;
                         s->last_mv[i][1][0] = mx;
                         dmx = get_dmv(s);
                         my = mpeg_decode_motion(s, s->mpeg_f_code[i][1],
-                                                s->last_mv[i][0][1] >> 1);
+                                                s->last_mv[i][0][1] >> my_shift);
                         dmy = get_dmv(s);
 
 
-                        s->last_mv[i][0][1] = my<<1;
-                        s->last_mv[i][1][1] = my<<1;
+                        s->last_mv[i][0][1] = my<<my_shift;
+                        s->last_mv[i][1][1] = my<<my_shift;
 
                         s->mv[i][0][0] = mx;
                         s->mv[i][0][1] = my;