Merge commit 'cf3523c6e7dde33a513e003639d5a8c0b7f3a49d' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 23:10:43 +0000 (00:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 23:10:43 +0000 (00:10 +0100)
commitd4afc388e38ea458979bd85fcc213d9da0e02810
tree2d87e77e13da7a1ad5913f0d27e1caa1a0b4a287
parent7071b8192d26c51c751ec8f8e0bc809d7377c95f
parentcf3523c6e7dde33a513e003639d5a8c0b7f3a49d
Merge commit 'cf3523c6e7dde33a513e003639d5a8c0b7f3a49d' into release/2.4

* commit 'cf3523c6e7dde33a513e003639d5a8c0b7f3a49d':
  prores: Extend the padding check to 16bit

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