Merge commit 'd1d99e3befea5d411ac3aae72dbdecce94f8b547'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 23:46:54 +0000 (01:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 23:49:21 +0000 (01:49 +0200)
commitc955bac7d5c1984dcb06539fe61844b7c09b72b4
treeb3030c93c37a26b2b85e10ab05dcc4035e9deac0
parent1eead877669b04a7f029001bfea8c8c3fd46763d
parentd1d99e3befea5d411ac3aae72dbdecce94f8b547
Merge commit 'd1d99e3befea5d411ac3aae72dbdecce94f8b547'

* commit 'd1d99e3befea5d411ac3aae72dbdecce94f8b547':
  pcx: Check the packet size before assuming it fits a palette

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/pcx.c