Mercurial > libavcodec.hg

changeset 1673:f17ba52fec08 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
MB_TYPE_INTERLACED info fix
author michael
date Wed, 10 Dec 2003 02:34:09 +0000
parents 1c9e8e499c56
children 835964e33ba2
files mpeg12.c
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mpeg12.c	Tue Dec 09 14:51:49 2003 +0000
+++ b/mpeg12.c	Wed Dec 10 02:34:09 2003 +0000
@@ -1170,7 +1170,7 @@
                             }
                         } else {
                             /* MT_16X8 */
-                            mb_type |= MB_TYPE_16x8; 
+                            mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED; 
                             s->mv_type = MV_TYPE_16X8;
                             for(j=0;j<2;j++) {
                                 s->field_select[i][j] = get_bits1(&s->gb);
@@ -1201,7 +1201,7 @@
                                 dprintf("fmy=%d\n", val);
                             }
                         } else {
-                            mb_type |= MB_TYPE_16x16; 
+                            mb_type |= MB_TYPE_16x16 | MB_TYPE_INTERLACED; 
                             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],
@@ -1259,6 +1259,9 @@
                             }
                         }
                         break;
+                    default:
+                        av_log(s->avctx, AV_LOG_ERROR, "00 motion_type at %d %d\n", s->mb_x, s->mb_y);
+                        return -1;
                     }
                 }
             }