RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mpegvideo: Mark one function as static

This commit is contained in:
Vittorio Giovara 2015-06-08 13:00:52 +01:00
parent d1dd0d404c
commit c0e6b8cab8
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mpegvideo.c
View File

@ -1448,7 +1448,7 @@ void ff_print_debug_info(MpegEncContext *s, Picture *p)
/** /**
* find the lowest MB row referenced in the MVs * 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_max = INT_MIN, my_min = INT_MAX, qpel_shift = !s->quarter_sample;
int my, off, i, mvs; 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(HAVE_THREADS && s->avctx->active_thread_type&FF_THREAD_FRAME) {
if (s->mv_dir & MV_DIR_FORWARD) { if (s->mv_dir & MV_DIR_FORWARD) {
ff_thread_await_progress(&s->last_picture_ptr->tf, ff_thread_await_progress(&s->last_picture_ptr->tf,
ff_mpv_lowest_referenced_row(s, 0), lowest_referenced_row(s, 0),
0); 0);
} }
if (s->mv_dir & MV_DIR_BACKWARD) { if (s->mv_dir & MV_DIR_BACKWARD) {
ff_thread_await_progress(&s->next_picture_ptr->tf, ff_thread_await_progress(&s->next_picture_ptr->tf,
ff_mpv_lowest_referenced_row(s, 1), lowest_referenced_row(s, 1),
0); 0);
} }
} }

2
libavcodec/mpegvideo.h
View File

@ -605,8 +605,6 @@ void ff_mpv_report_decode_progress(MpegEncContext *s);
int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx); int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx);
void ff_mpv_frame_end(MpegEncContext *s); void ff_mpv_frame_end(MpegEncContext *s);
int ff_mpv_lowest_referenced_row(MpegEncContext *s, int dir);
int ff_mpv_encode_init(AVCodecContext *avctx); int ff_mpv_encode_init(AVCodecContext *avctx);
void ff_mpv_encode_init_x86(MpegEncContext *s); void ff_mpv_encode_init_x86(MpegEncContext *s);