[FFmpeg-cvslog] Merge commit '15ee419b7abaf17f8c662c145fe93d3dbf43282b'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 19 17:51:56 2017 +0100| [2da66630dce7a21b26bca8e47714a555bdb28a53] | committer: Clément Bœsch

Merge commit '15ee419b7abaf17f8c662c145fe93d3dbf43282b'

* commit '15ee419b7abaf17f8c662c145fe93d3dbf43282b':
  pcx: properly pad the scanline

This commit is a noop, see d24de4596c3f980c9cc1cb5c8706c8411e46275b

Merged-by: Clément Bœsch <u at pkh.me>

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