diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 04:14:58 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 04:36:31 +0200 |
commit | daff49ccf3e5d9e90851595c4ea3199140f40f50 (patch) | |
tree | e1ee0b8c5d670173d4dacd79f9680e73486d05a5 /libavcodec/vda_h264.c | |
parent | 3ffa38580190f56d255bca2449b27720b6c18d60 (diff) | |
parent | 80f955c90867561dcce769216bc497e13281eb38 (diff) | |
download | ffmpeg-daff49ccf3e5d9e90851595c4ea3199140f40f50.tar.gz |
Merge commit '80f955c90867561dcce769216bc497e13281eb38'
* commit '80f955c90867561dcce769216bc497e13281eb38':
vda: Check the correct pointer for buffer allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vda_h264.c')
-rw-r--r-- | libavcodec/vda_h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vda_h264.c b/libavcodec/vda_h264.c index 4d2274d649..a1179f16e2 100644 --- a/libavcodec/vda_h264.c +++ b/libavcodec/vda_h264.c @@ -409,7 +409,7 @@ static int vda_h264_end_frame(AVCodecContext *avctx) sizeof(vda->frame), release_buffer, NULL, AV_BUFFER_FLAG_READONLY); - if (!frame->buf) + if (!frame->buf[0]) return AVERROR(ENOMEM); frame->data[3] = (uint8_t*)vda->frame; |