RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 17:32:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '40af330adf7fde8073271cf2b41ff9adc4c2bba9'

Browse Source 
* commit '40af330adf7fde8073271cf2b41ff9adc4c2bba9':
  avconv: vda: Unlock the pixel buffer once it is accessed

See: c06fdacc3d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-07-09 12:18:21 +02:00
commit 7e85727b98
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ffmpeg_vda.c
View File

@ -76,9 +76,10 @@ static int vda_retrieve_data(AVCodecContext *s, AVFrame *frame)
(const uint8_t **)data, linesize, vda->tmp_frame->format, (const uint8_t **)data, linesize, vda->tmp_frame->format,
frame->width, frame->height); frame->width, frame->height);
ret = av_frame_copy_props(vda->tmp_frame, frame);
CVPixelBufferUnlockBaseAddress(pixbuf, kCVPixelBufferLock_ReadOnly); CVPixelBufferUnlockBaseAddress(pixbuf, kCVPixelBufferLock_ReadOnly);
ret = av_frame_copy_props(vda->tmp_frame, frame);
if (ret < 0) if (ret < 0)
return ret; return ret;