Merge commit '3abde1a3b49cf299f2aae4eaae6b6cb5270bdc22'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 10:57:17 +0000 (12:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 10:58:13 +0000 (12:58 +0200)
commit50617fce073ca3e360388b38a83341e37db92b80
tree68d2e0a250dbb5ae9a935031f385e9239f4a86b2
parent54bbb9056801b778126a4bf5036d9d3638da1802
parent3abde1a3b49cf299f2aae4eaae6b6cb5270bdc22
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@gmx.at>
libavcodec/pcx.c