[SCM] libav/experimental: mpeg: Mark ff_mpeg_set_erpic() static

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:03:34 UTC 2014


The following commit has been merged in the experimental branch:
commit 8d695dc411c1ae28477f107d6f7bf2db59af95df
Author: Diego Biurrun <diego at biurrun.de>
Date:   Fri Jun 20 05:25:12 2014 -0700

    mpeg: Mark ff_mpeg_set_erpic() static
    
    It is not used outside of the file.

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index f6fc8dc..f32aad2 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -2468,7 +2468,7 @@ void ff_MPV_report_decode_progress(MpegEncContext *s)
 }
 
 #if CONFIG_ERROR_RESILIENCE
-void ff_mpeg_set_erpic(ERPicture *dst, Picture *src)
+static void set_erpic(ERPicture *dst, Picture *src)
 {
     int i;
 
@@ -2494,9 +2494,9 @@ void ff_mpeg_er_frame_start(MpegEncContext *s)
 {
     ERContext *er = &s->er;
 
-    ff_mpeg_set_erpic(&er->cur_pic, s->current_picture_ptr);
-    ff_mpeg_set_erpic(&er->next_pic, s->next_picture_ptr);
-    ff_mpeg_set_erpic(&er->last_pic, s->last_picture_ptr);
+    set_erpic(&er->cur_pic,  s->current_picture_ptr);
+    set_erpic(&er->next_pic, s->next_picture_ptr);
+    set_erpic(&er->last_pic, s->last_picture_ptr);
 
     er->pp_time           = s->pp_time;
     er->pb_time           = s->pb_time;
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 7b0673c..36b3358 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -725,7 +725,6 @@ void ff_set_qscale(MpegEncContext * s, int qscale);
 
 /* Error resilience */
 void ff_mpeg_er_frame_start(MpegEncContext *s);
-void ff_mpeg_set_erpic(ERPicture *dst, Picture *src);
 
 int ff_dct_common_init(MpegEncContext *s);
 void ff_convert_matrix(DSPContext *dsp, int (*qmat)[64], uint16_t (*qmat16)[2][64],

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list