* commit 'b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44': lavf-regression: use -frames instead of -t for image tests Conflicts: tests/lavf-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>