
* commit '96a06dbaf278e8152487e08772946f63bd2a3843': FATE: add support for testing hwaccels Conflicts: tests/Makefile tests/fate-run.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '96a06dbaf278e8152487e08772946f63bd2a3843': FATE: add support for testing hwaccels Conflicts: tests/Makefile tests/fate-run.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>