# HG changeset patch
# User michaelni
# Date 1049278709 0
# Node ID f0c39139426d3db6c5d89af47b693b8e0402d65e
# Parent  0e3c0c4a7b3d3478090e63ecb0adb3c87aff019d
10l

diff -r 0e3c0c4a7b3d -r f0c39139426d mpegvideo.c
--- a/mpegvideo.c	Wed Apr 02 09:57:34 2003 +0000
+++ b/mpegvideo.c	Wed Apr 02 10:18:29 2003 +0000
@@ -2396,10 +2396,10 @@
             
         if(s->codec_id==CODEC_ID_MPEG4){        
             if(!s->mb_intra){
-                assert(s->dquant==0 || s->mv_type!=MV_TYPE_8X8);
-
                 if(s->mv_dir&MV_DIRECT)
                     s->dquant=0;
+
+                assert(s->dquant==0 || s->mv_type!=MV_TYPE_8X8);
             }
         }
         s->qscale+= s->dquant;
diff -r 0e3c0c4a7b3d -r f0c39139426d utils.c
--- a/utils.c	Wed Apr 02 09:57:34 2003 +0000
+++ b/utils.c	Wed Apr 02 10:18:29 2003 +0000
@@ -131,7 +131,7 @@
     DefaultPicOpaque *opaque;
     
     assert(pic->data[0]==NULL);
-    assert(pic->type==0 || pic->type==FF_TYPE_INTERNAL);
+    assert(pic->type==0 || pic->type==FF_BUFFER_TYPE_INTERNAL);
 
     if(pic->opaque){
         opaque= (DefaultPicOpaque *)pic->opaque;
@@ -181,8 +181,8 @@
         opaque->last_pic_num= -256*256*256*64;
 
         for(i=0; i<3; i++){
-            int h_shift= i==0 ? 0 : h_chroma_shift;
-            int v_shift= i==0 ? 0 : v_chroma_shift;
+            const int h_shift= i==0 ? 0 : h_chroma_shift;
+            const int v_shift= i==0 ? 0 : v_chroma_shift;
 
             pic->linesize[i]= pixel_size*w>>h_shift;