
* commit '71f1ad37d858b810b71a4af1c25771beaa50b27b': lavc: do not compile fmtconvert unconditionally Conflicts: configure libavcodec/ppc/Makefile libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '71f1ad37d858b810b71a4af1c25771beaa50b27b': lavc: do not compile fmtconvert unconditionally Conflicts: configure libavcodec/ppc/Makefile libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>