It is only called from one place in mpegvideo.c now. Also remove the
remove_current parameter, which is always 1.
---
libavcodec/mpegvideo.c | 8 +++-----
libavcodec/mpegvideo.h | 1 -
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index ed740d4..5036e2a 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1256,16 +1256,14 @@ void ff_MPV_common_end(MpegEncContext *s)
s->linesize = s->uvlinesize = 0;
}
-void ff_release_unused_pictures(MpegEncContext*s, int remove_current)
+static void release_unused_pictures(MpegEncContext *s)
{
int i;
/* release non reference frames */
for (i = 0; i < MAX_PICTURE_COUNT; i++) {
- if (!s->picture[i].reference &&
- (remove_current || &s->picture[i] != s->current_picture_ptr)) {
+ if (!s->picture[i].reference)
ff_mpeg_unref_picture(s, &s->picture[i]);
- }
}
}
@@ -1368,7 +1366,7 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext
*avctx)
ff_mpeg_unref_picture(s, &s->current_picture);
if (!s->encoding) {
- ff_release_unused_pictures(s, 1);
+ release_unused_pictures(s);
if (s->current_picture_ptr &&
s->current_picture_ptr->f.buf[0] == NULL) {
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index f342948..e29527f 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -794,7 +794,6 @@ void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int
h);
void ff_mpeg_flush(AVCodecContext *avctx);
void ff_print_debug_info(MpegEncContext *s, Picture *p);
void ff_write_quant_matrix(PutBitContext *pb, uint16_t *matrix);
-void ff_release_unused_pictures(MpegEncContext *s, int remove_current);
int ff_find_unused_picture(MpegEncContext *s, int shared);
void ff_denoise_dct(MpegEncContext *s, int16_t *block);
int ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src);
--
1.7.10.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
