comparison mpegvideo_enc.c @ 7974:2b20ad98e424 libavcodec

Rename copy_picture to ff_copy_picture.
author cehoyos
date Thu, 02 Oct 2008 00:27:09 +0000
parents 635ed2559262
children a0f9045e0a82
comparison
equal deleted inserted replaced
7973:fb9a51e5d116 7974:2b20ad98e424
1159 } 1159 }
1160 no_output_pic: 1160 no_output_pic:
1161 if(s->reordered_input_picture[0]){ 1161 if(s->reordered_input_picture[0]){
1162 s->reordered_input_picture[0]->reference= s->reordered_input_picture[0]->pict_type!=FF_B_TYPE ? 3 : 0; 1162 s->reordered_input_picture[0]->reference= s->reordered_input_picture[0]->pict_type!=FF_B_TYPE ? 3 : 0;
1163 1163
1164 copy_picture(&s->new_picture, s->reordered_input_picture[0]); 1164 ff_copy_picture(&s->new_picture, s->reordered_input_picture[0]);
1165 1165
1166 if(s->reordered_input_picture[0]->type == FF_BUFFER_TYPE_SHARED || s->avctx->rc_buffer_size){ 1166 if(s->reordered_input_picture[0]->type == FF_BUFFER_TYPE_SHARED || s->avctx->rc_buffer_size){
1167 // input is a shared pix, so we can't modifiy it -> alloc a new one & ensure that the shared one is reuseable 1167 // input is a shared pix, so we can't modifiy it -> alloc a new one & ensure that the shared one is reuseable
1168 1168
1169 int i= ff_find_unused_picture(s, 0); 1169 int i= ff_find_unused_picture(s, 0);
1191 s->current_picture_ptr= s->reordered_input_picture[0]; 1191 s->current_picture_ptr= s->reordered_input_picture[0];
1192 for(i=0; i<4; i++){ 1192 for(i=0; i<4; i++){
1193 s->new_picture.data[i]+= INPLACE_OFFSET; 1193 s->new_picture.data[i]+= INPLACE_OFFSET;
1194 } 1194 }
1195 } 1195 }
1196 copy_picture(&s->current_picture, s->current_picture_ptr); 1196 ff_copy_picture(&s->current_picture, s->current_picture_ptr);
1197 1197
1198 s->picture_number= s->new_picture.display_picture_number; 1198 s->picture_number= s->new_picture.display_picture_number;
1199 //printf("dpn:%d\n", s->picture_number); 1199 //printf("dpn:%d\n", s->picture_number);
1200 }else{ 1200 }else{
1201 memset(&s->new_picture, 0, sizeof(Picture)); 1201 memset(&s->new_picture, 0, sizeof(Picture));