virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

Merge commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8'

Browse Source 
* commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8':
  lavc/decode_video(): always unref the frame if there is no output in decode_video

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-09 17:48:24 +01:00
commit f3acdd44bf
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/utils.c
View File

@ -2090,9 +2090,6 @@ fail:
ret = avpkt->size;
}
if (ret < 0 && picture->buf[0])
av_frame_unref(picture);
if (*got_picture_ptr) {
if (!avctx->refcounted_frames) {
avci->to_free = *picture;
@ -2105,7 +2102,8 @@ fail:
guess_correct_pts(avctx,
picture->pkt_pts,
picture->pkt_dts));
}
} else
av_frame_unref(picture);
} else
ret = 0;