diff options
| -rw-r--r-- | libavcodec/h264.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 8 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index b9d63543b3..6542188eb8 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3921,11 +3921,11 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ if(h->slice_type_nos!=FF_I_TYPE){ s->last_picture_ptr= &h->ref_list[0][0]; - copy_picture(&s->last_picture, s->last_picture_ptr); + ff_copy_picture(&s->last_picture, s->last_picture_ptr); } if(h->slice_type_nos==FF_B_TYPE){ s->next_picture_ptr= &h->ref_list[1][0]; - copy_picture(&s->next_picture, s->next_picture_ptr); + ff_copy_picture(&s->next_picture, s->next_picture_ptr); } if( (h->pps.weighted_pred && h->slice_type_nos == FF_P_TYPE ) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 588bb7896c..4bc32a2316 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -153,7 +153,7 @@ int ff_dct_common_init(MpegEncContext *s) return 0; } -void copy_picture(Picture *dst, Picture *src){ +void ff_copy_picture(Picture *dst, Picture *src){ *dst = *src; dst->type= FF_BUFFER_TYPE_COPY; } @@ -878,7 +878,7 @@ alloc: // s->current_picture_ptr->quality= s->new_picture_ptr->quality; s->current_picture_ptr->key_frame= s->pict_type == FF_I_TYPE; - copy_picture(&s->current_picture, s->current_picture_ptr); + ff_copy_picture(&s->current_picture, s->current_picture_ptr); if (s->pict_type != FF_B_TYPE) { s->last_picture_ptr= s->next_picture_ptr; @@ -891,8 +891,8 @@ alloc: s->current_picture_ptr ? s->current_picture_ptr->data[0] : NULL, s->pict_type, s->dropable);*/ - if(s->last_picture_ptr) copy_picture(&s->last_picture, s->last_picture_ptr); - if(s->next_picture_ptr) copy_picture(&s->next_picture, s->next_picture_ptr); + if(s->last_picture_ptr) ff_copy_picture(&s->last_picture, s->last_picture_ptr); + if(s->next_picture_ptr) ff_copy_picture(&s->next_picture, s->next_picture_ptr); if(s->pict_type != FF_I_TYPE && (s->last_picture_ptr==NULL || s->last_picture_ptr->data[0]==NULL) && !s->dropable && s->codec_id != CODEC_ID_H264){ av_log(avctx, AV_LOG_ERROR, "warning: first frame is no keyframe\n"); diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 2c2a509dc4..aaffb86ef0 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -701,7 +701,7 @@ void ff_convert_matrix(DSPContext *dsp, int (*qmat)[64], uint16_t (*qmat16)[2][6 const uint16_t *quant_matrix, int bias, int qmin, int qmax, int intra); void ff_init_block_index(MpegEncContext *s); -void copy_picture(Picture *dst, Picture *src); +void ff_copy_picture(Picture *dst, Picture *src); static inline void ff_update_block_index(MpegEncContext *s){ const int block_size= 8>>s->avctx->lowres; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index afaf4a1d6a..0c60707a04 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1161,7 +1161,7 @@ no_output_pic: if(s->reordered_input_picture[0]){ s->reordered_input_picture[0]->reference= s->reordered_input_picture[0]->pict_type!=FF_B_TYPE ? 3 : 0; - copy_picture(&s->new_picture, s->reordered_input_picture[0]); + ff_copy_picture(&s->new_picture, s->reordered_input_picture[0]); if(s->reordered_input_picture[0]->type == FF_BUFFER_TYPE_SHARED || s->avctx->rc_buffer_size){ // input is a shared pix, so we can't modifiy it -> alloc a new one & ensure that the shared one is reuseable @@ -1193,7 +1193,7 @@ no_output_pic: s->new_picture.data[i]+= INPLACE_OFFSET; } } - copy_picture(&s->current_picture, s->current_picture_ptr); + ff_copy_picture(&s->current_picture, s->current_picture_ptr); s->picture_number= s->new_picture.display_picture_number; //printf("dpn:%d\n", s->picture_number); |