[FFmpeg-cvslog] mpegvideo: Drop release_unused_pictures() function
Vittorio Giovara
git at videolan.org
Wed Jun 10 20:58:23 CEST 2015
ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Mon Jun 8 13:00:50 2015 +0100| [c6aa0554b0c3e31fec4580b68ea85b66966cd381] | committer: Vittorio Giovara
mpegvideo: Drop release_unused_pictures() function
It is only used in one place, and it is small enough that it might be
called directly.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c6aa0554b0c3e31fec4580b68ea85b66966cd381
---
libavcodec/mpegvideo.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 86eab07..1ea2b65 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -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
More information about the ffmpeg-cvslog
mailing list