[FFmpeg-cvslog] Merge commit '430d12196432ded13f011a3bf7690f03c9b2e5d6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 22 12:51:00 2013 +0100| [8617be28d074c4708d2c948cbc311737cf2fbf39] | committer: Michael Niedermayer

Merge commit '430d12196432ded13f011a3bf7690f03c9b2e5d6'

* commit '430d12196432ded13f011a3bf7690f03c9b2e5d6':
  pcx: round up in bits->bytes conversion in a buffer size check

Conflicts:
	libavcodec/pcx.c

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

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