-
Michael Niedermayer authored
* commit '3a56bcee': mpeg12dec: Use more specific error codes Conflicts: libavcodec/mpeg12dec.c See: 1852b2a0Merged-by: Michael Niedermayer <michaelni@gmx.at>
9d921cce
* commit '3a56bcee': mpeg12dec: Use more specific error codes Conflicts: libavcodec/mpeg12dec.c See: 1852b2a0Merged-by: Michael Niedermayer <michaelni@gmx.at>