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 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56'

Browse Source 
* commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56':
  lavc: use buf[0] instead of data[0] as the indicator of an allocated frame

Conflicts:
	libavcodec/utils.c

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

2
libavcodec/utils.c
View File

@ -2090,7 +2090,7 @@ fail:
ret = avpkt->size;
}
if (ret < 0 && picture->data[0])
if (ret < 0 && picture->buf[0])
av_frame_unref(picture);
if (*got_picture_ptr) {