# HG changeset patch
# User cehoyos
# Date 1222907229 0
# Node ID 2b20ad98e4243009694ecde0189ab23c4a854c6f
# Parent  fb9a51e5d11683e0fb5aaf4aaf13bfaca93b2f47
Rename copy_picture to ff_copy_picture.

diff -r fb9a51e5d116 -r 2b20ad98e424 h264.c
--- a/h264.c	Wed Oct 01 21:47:49 2008 +0000
+++ b/h264.c	Thu Oct 02 00:27:09 2008 +0000
@@ -3921,11 +3921,11 @@
 
     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 -r fb9a51e5d116 -r 2b20ad98e424 mpegvideo.c
--- a/mpegvideo.c	Wed Oct 01 21:47:49 2008 +0000
+++ b/mpegvideo.c	Thu Oct 02 00:27:09 2008 +0000
@@ -153,7 +153,7 @@
     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 @@
   //      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 @@
         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 -r fb9a51e5d116 -r 2b20ad98e424 mpegvideo.h
--- a/mpegvideo.h	Wed Oct 01 21:47:49 2008 +0000
+++ b/mpegvideo.h	Thu Oct 02 00:27:09 2008 +0000
@@ -701,7 +701,7 @@
                        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 -r fb9a51e5d116 -r 2b20ad98e424 mpegvideo_enc.c
--- a/mpegvideo_enc.c	Wed Oct 01 21:47:49 2008 +0000
+++ b/mpegvideo_enc.c	Thu Oct 02 00:27:09 2008 +0000
@@ -1161,7 +1161,7 @@
     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 @@
                 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);