-
Michael Niedermayer authored
* commit '9fb0de86': pcx: Consume the whole packet if giving up due to missing palette Conflicts: libavcodec/pcx.c See: b4e516e3Merged-by: Michael Niedermayer <michaelni@gmx.at>
a612bb30
* commit '9fb0de86': pcx: Consume the whole packet if giving up due to missing palette Conflicts: libavcodec/pcx.c See: b4e516e3Merged-by: Michael Niedermayer <michaelni@gmx.at>