mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-23 19:30:05 +00:00
10l
Originally committed as revision 1725 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
4d2a48349d
commit
2c19981a93
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user