Merge commit '74a9a624'
* commit '74a9a624': vcr1: return a meaningful error code. rpza: return a meaningful error code. qdrw: cosmetics, reformat Conflicts: libavcodec/qdrw.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment