diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 12:18:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 12:19:34 +0200 |
| commit | 7e85727b984a605f1824fe076b58bf8209d83999 (patch) | |
| tree | 3c98444d07e9db32bf3d18129a1b143aca455325 /ffmpeg_vda.c | |
| parent | 8d4460f1bbe94e02382594cee8dbb3e8ad2f9f32 (diff) | |
| parent | 40af330adf7fde8073271cf2b41ff9adc4c2bba9 (diff) | |
| download | ffmpeg-7e85727b984a605f1824fe076b58bf8209d83999.tar.gz | |
Merge commit '40af330adf7fde8073271cf2b41ff9adc4c2bba9'
* commit '40af330adf7fde8073271cf2b41ff9adc4c2bba9':
avconv: vda: Unlock the pixel buffer once it is accessed
See: c06fdacc3dc706e70d953917fea845532d3703ca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_vda.c')
| -rw-r--r-- | ffmpeg_vda.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ffmpeg_vda.c b/ffmpeg_vda.c index 6fe4ed45ea..79a8503e7d 100644 --- a/ffmpeg_vda.c +++ b/ffmpeg_vda.c @@ -76,9 +76,10 @@ static int vda_retrieve_data(AVCodecContext *s, AVFrame *frame) (const uint8_t **)data, linesize, vda->tmp_frame->format, frame->width, frame->height); - ret = av_frame_copy_props(vda->tmp_frame, frame); CVPixelBufferUnlockBaseAddress(pixbuf, kCVPixelBufferLock_ReadOnly); + ret = av_frame_copy_props(vda->tmp_frame, frame); + if (ret < 0) return ret; |