Merge commit '430d1219'

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

Conflicts:
	libavcodec/pcx.c

See: 6462268eMerged-by: Michael Niedermayer <michaelni@gmx.at>