From 2c19981a93c5c6dd499cc9880a3ecc8a4bbc4753 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 2 Apr 2003 10:18:29 +0000 Subject: [PATCH] 10l Originally committed as revision 1725 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpegvideo.c | 4 ++-- libavcodec/utils.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 99ac289f91..26253d0430 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -2396,10 +2396,10 @@ static void encode_mb(MpegEncContext *s, int motion_x, int motion_y) 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 --git a/libavcodec/utils.c b/libavcodec/utils.c index 037abdc00f..5e1fbee173 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -131,7 +131,7 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){ 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 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){ 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;