]> git.sesse.net Git - ffmpeg/commitdiff
mpegvideo: Drop release_unused_pictures() function
authorVittorio Giovara <vittorio.giovara@gmail.com>
Mon, 8 Jun 2015 12:00:50 +0000 (13:00 +0100)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Wed, 10 Jun 2015 13:05:53 +0000 (14:05 +0100)
It is only used in one place, and it is small enough that it might be
called directly.

libavcodec/mpegvideo.c

index 86eab07c70f94aaae6932e5cb3ff887030a757e2..1ea2b6530fd85986ff061986c90990ccda9d3b21 100644 (file)
@@ -1109,17 +1109,6 @@ void ff_mpv_common_end(MpegEncContext *s)
     s->linesize = s->uvlinesize = 0;
 }
 
-static void release_unused_pictures(AVCodecContext *avctx, Picture *picture)
-{
-    int i;
-
-    /* release non reference frames */
-    for (i = 0; i < MAX_PICTURE_COUNT; i++) {
-        if (!picture[i].reference)
-            ff_mpeg_unref_picture(avctx, &picture[i]);
-    }
-}
-
 /**
  * generic function called after decoding
  * the header and before a frame is decoded.
@@ -1152,7 +1141,11 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx)
 
     ff_mpeg_unref_picture(s->avctx, &s->current_picture);
 
-    release_unused_pictures(s->avctx, s->picture);
+    /* release non reference frames */
+    for (i = 0; i < MAX_PICTURE_COUNT; i++) {
+        if (!s->picture[i].reference)
+            ff_mpeg_unref_picture(s->avctx, &s->picture[i]);
+    }
 
     if (s->current_picture_ptr && !s->current_picture_ptr->f->buf[0]) {
         // we already have a unused image