virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit 'c6aa0554b0c3e31fec4580b68ea85b66966cd381'

Browse Source 
* commit 'c6aa0554b0c3e31fec4580b68ea85b66966cd381':
  mpegvideo: Drop release_unused_pictures() function

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-10 20:50:36 +02:00
parent 88679aeb08 c6aa0554b0
commit d784d6b7ed
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/mpegvideo.c
View File

@@ -1140,16 +1140,6 @@ void ff_mpv_common_end(MpegEncContext *s)
s->linesize = s->uvlinesize = 0; 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]);
}
}
static void gray_frame(AVFrame *frame) static void gray_frame(AVFrame *frame)
{ {
@@ -1204,7 +1194,11 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx)
ff_mpeg_unref_picture(s->avctx, &s->current_picture); 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]) { if (s->current_picture_ptr && !s->current_picture_ptr->f->buf[0]) {
// we already have a unused image // we already have a unused image