diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 14:28:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 14:28:30 +0100 |
| commit | c7002e3d3dad3e026ec304066de65b5a21910067 (patch) | |
| tree | 3db66c24ee373287429a82c0c076f12d83ec77f1 | |
| parent | 1c65393906abcf25f454834cf038c5a6ee1c3624 (diff) | |
| parent | 12b54a1f39fee22fa0399825ae47a43e60bad4c5 (diff) | |
Merge commit '12b54a1f39fee22fa0399825ae47a43e60bad4c5'
* commit '12b54a1f39fee22fa0399825ae47a43e60bad4c5':
mpegvideo: remove an unused function parameter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpegvideo.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index f4c651688e..00388dfdfa 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -455,7 +455,7 @@ static void free_picture(MpegEncContext *s, Picture *pic) } } -static int init_duplicate_context(MpegEncContext *s, MpegEncContext *base) +static int init_duplicate_context(MpegEncContext *s) { int y_size = s->b8_stride * (2 * s->mb_height + 1); int c_size = s->mb_stride * (s->mb_height + 1); @@ -958,7 +958,7 @@ av_cold int ff_MPV_common_init(MpegEncContext *s) } for (i = 0; i < nb_slices; i++) { - if (init_duplicate_context(s->thread_context[i], s) < 0) + if (init_duplicate_context(s->thread_context[i]) < 0) goto fail; s->thread_context[i]->start_mb_y = (s->mb_height * (i) + nb_slices / 2) / nb_slices; @@ -966,7 +966,7 @@ av_cold int ff_MPV_common_init(MpegEncContext *s) (s->mb_height * (i + 1) + nb_slices / 2) / nb_slices; } } else { - if (init_duplicate_context(s, s) < 0) + if (init_duplicate_context(s) < 0) goto fail; s->start_mb_y = 0; s->end_mb_y = s->mb_height; @@ -1088,7 +1088,7 @@ int ff_MPV_common_frame_size_change(MpegEncContext *s) } for (i = 0; i < nb_slices; i++) { - if (init_duplicate_context(s->thread_context[i], s) < 0) + if (init_duplicate_context(s->thread_context[i]) < 0) goto fail; s->thread_context[i]->start_mb_y = (s->mb_height * (i) + nb_slices / 2) / nb_slices; @@ -1096,7 +1096,7 @@ int ff_MPV_common_frame_size_change(MpegEncContext *s) (s->mb_height * (i + 1) + nb_slices / 2) / nb_slices; } } else { - if (init_duplicate_context(s, s) < 0) + if (init_duplicate_context(s) < 0) goto fail; s->start_mb_y = 0; s->end_mb_y = s->mb_height; |