[FFmpeg-cvslog] Merge commit '40af330adf7fde8073271cf2b41ff9adc4c2bba9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul  9 12:18:21 2015 +0200| [7e85727b984a605f1824fe076b58bf8209d83999] | committer: Michael Niedermayer

Merge commit '40af330adf7fde8073271cf2b41ff9adc4c2bba9'

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

See: c06fdacc3dc706e70d953917fea845532d3703ca
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7e85727b984a605f1824fe076b58bf8209d83999
---