Merge commit 'dbc1163b203b175d246b7454c32ac176f84006d1'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Mar 2015 19:00:43 +0000 (20:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Mar 2015 19:01:28 +0000 (20:01 +0100)
commitada512f91df6b1ed2fc15bd1b497a09de120ec49
tree53ba4b73d856ee7aa7f240cf6bb66c020c606398
parentefd3f407e50ec04eb9b90825bf8436f221e65de8
parentdbc1163b203b175d246b7454c32ac176f84006d1
Merge commit 'dbc1163b203b175d246b7454c32ac176f84006d1'

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

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