diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 00:57:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 00:57:47 +0200 |
| commit | 412015694c083ccbd5f66ffd8b078f53e8a6ab6a (patch) | |
| tree | 1d0248f2b95b4e441428c127ca756fa2d69b7ef3 /libavcodec/mpegvideo.c | |
| parent | ffc2c095ef7c4bf8b330a841f9ed76b0648bbc2d (diff) | |
| parent | 8d695dc411c1ae28477f107d6f7bf2db59af95df (diff) | |
Merge commit '8d695dc411c1ae28477f107d6f7bf2db59af95df'
* commit '8d695dc411c1ae28477f107d6f7bf2db59af95df':
mpeg: Mark ff_mpeg_set_erpic() static
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 74369e55a5..6238545715 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -3237,7 +3237,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; @@ -3264,9 +3264,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; |