diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 21:07:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 21:07:59 +0200 |
| commit | 11f86ec204833c169376c29a1cc9d322e93165cd (patch) | |
| tree | 8c4262d5748125dec5fa6b27532da460a1083b21 /libavcodec | |
| parent | 21d8e2c0b5aa5bae900fcfeb7f29de1d2261c2bd (diff) | |
| parent | c0e6b8cab874db97b6818007bc86507c8d213083 (diff) | |
| download | ffmpeg-11f86ec204833c169376c29a1cc9d322e93165cd.tar.gz | |
Merge commit 'c0e6b8cab874db97b6818007bc86507c8d213083'
* commit 'c0e6b8cab874db97b6818007bc86507c8d213083':
mpegvideo: Mark one function as static
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo.c | 6 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 420d73f85e..2b01d7bb72 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -2329,7 +2329,7 @@ static inline void MPV_motion_lowres(MpegEncContext *s, /** * 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; @@ -2524,12 +2524,12 @@ void mpv_decode_mb_internal(MpegEncContext *s, int16_t block[12][64], 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 e538695a98..a35897517a 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -631,8 +631,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); |