[FFmpeg-cvslog] Merge commit 'dbc1163b203b175d246b7454c32ac176f84006d1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  2 20:00:43 2015 +0100| [ada512f91df6b1ed2fc15bd1b497a09de120ec49] | committer: Michael Niedermayer

Merge commit 'dbc1163b203b175d246b7454c32ac176f84006d1'

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

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

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