-
Michael Niedermayer authored
* qatar/master: faxcompr: return meaningful errors Conflicts: libavcodec/faxcompr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
f973f174
* qatar/master:
faxcompr: return meaningful errors
Conflicts:
libavcodec/faxcompr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>