[FFmpeg-cvslog] Merge commit '3abde1a3b49cf299f2aae4eaae6b6cb5270bdc22'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 12 12:57:17 2013 +0200| [50617fce073ca3e360388b38a83341e37db92b80] | committer: Michael Niedermayer

Merge commit '3abde1a3b49cf299f2aae4eaae6b6cb5270bdc22'

* commit '3abde1a3b49cf299f2aae4eaae6b6cb5270bdc22':
  pcx: Do not overread source buffer in pcx_rle_decode

Conflicts:
	libavcodec/pcx.c

See: 8cd1c0febe88b757e915e9af15559575c21ca728
Bytestream based system is left in place and not switched to buf+end, such switch would be
a step backward

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

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