[FFmpeg-cvslog] mpegvideo: Mark one function as static
Vittorio Giovara
git at videolan.org
Wed Jun 10 21:19:00 CEST 2015
ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Mon Jun 8 13:00:52 2015 +0100| [c0e6b8cab874db97b6818007bc86507c8d213083] | committer: Vittorio Giovara
mpegvideo: Mark one function as static
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0e6b8cab874db97b6818007bc86507c8d213083
---
libavcodec/mpegvideo.c | 6 +++---
libavcodec/mpegvideo.h | 2 --
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 68f9568..0a4f5bb 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1448,7 +1448,7 @@ void ff_print_debug_info(MpegEncContext *s, Picture *p)
/**
* find the lowest MB row referenced in the MVs
*/
-int ff_mpv_lowest_referenced_row(MpegEncContext *s, int dir)
+static int lowest_referenced_row(MpegEncContext *s, int dir)
{
int my_max = INT_MIN, my_min = INT_MAX, qpel_shift = !s->quarter_sample;
int my, off, i, mvs;
@@ -1646,12 +1646,12 @@ FF_ENABLE_DEPRECATION_WARNINGS
if(HAVE_THREADS && s->avctx->active_thread_type&FF_THREAD_FRAME) {
if (s->mv_dir & MV_DIR_FORWARD) {
ff_thread_await_progress(&s->last_picture_ptr->tf,
- ff_mpv_lowest_referenced_row(s, 0),
+ lowest_referenced_row(s, 0),
0);
}
if (s->mv_dir & MV_DIR_BACKWARD) {
ff_thread_await_progress(&s->next_picture_ptr->tf,
- ff_mpv_lowest_referenced_row(s, 1),
+ lowest_referenced_row(s, 1),
0);
}
}
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 1a6857d..667566a 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -605,8 +605,6 @@ void ff_mpv_report_decode_progress(MpegEncContext *s);
int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx);
void ff_mpv_frame_end(MpegEncContext *s);
-int ff_mpv_lowest_referenced_row(MpegEncContext *s, int dir);
-
int ff_mpv_encode_init(AVCodecContext *avctx);
void ff_mpv_encode_init_x86(MpegEncContext *s);
More information about the ffmpeg-cvslog
mailing list