Merge commit '80f955c90867561dcce769216bc497e13281eb38'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jul 2015 02:14:58 +0000 (04:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jul 2015 02:36:31 +0000 (04:36 +0200)
* commit '80f955c90867561dcce769216bc497e13281eb38':
  vda: Check the correct pointer for buffer allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/vda_h264.c

Simple merge