* commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f': pcx: Return an error on broken palette if err_detect is set to 'explode' Conflicts: libavcodec/pcx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>