Merge commit '40af330adf7fde8073271cf2b41ff9adc4c2bba9'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jul 2015 10:18:21 +0000 (12:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jul 2015 10:19:34 +0000 (12:19 +0200)
commit7e85727b984a605f1824fe076b58bf8209d83999
tree3c98444d07e9db32bf3d18129a1b143aca455325
parent8d4460f1bbe94e02382594cee8dbb3e8ad2f9f32
parent40af330adf7fde8073271cf2b41ff9adc4c2bba9
Merge commit '40af330adf7fde8073271cf2b41ff9adc4c2bba9'

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

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