diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 16:07:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 16:07:17 +0100 |
| commit | f4332e959161ef7a58564104e092148ef7409d7d (patch) | |
| tree | f73b9e9d8ba7c701e7634dbfa072309ba3715021 /libavcodec | |
| parent | cefabaad3e882004ca7a54ea39500ee8e1c6ea93 (diff) | |
| parent | d4f0f2d1e80b76260eb6b9cdde472ac069dfda56 (diff) | |
| download | ffmpeg-f4332e959161ef7a58564104e092148ef7409d7d.tar.gz | |
Merge commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56'
* 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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index a078e8c3bf..a93b2bdff2 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -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) { |