diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-08-01 10:27:04 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-08-01 10:27:04 +0000 |
| commit | 43d2c6a5113c0d1e76fa7439f832969cd3b4ccc5 (patch) | |
| tree | 08ea62eceb42b76174d6cce5886cf7212d1bb7b3 | |
| parent | 2b346e042ea47f6c8db5c6322ec3ecb57913808a (diff) | |
| download | ffmpeg-43d2c6a5113c0d1e76fa7439f832969cd3b4ccc5.tar.gz | |
Fix fate-lavfi-pixfmts test cross-compilation.
Add the lavfi-showfiltfmts dependency in the Makefile, and correctly
use the $target_exec and $target_path variables for invoking the
lavfi-showfiltfmts tool.
Originally committed as revision 24645 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 5 | ||||
| -rwxr-xr-x | tests/lavfi-regression.sh | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -226,6 +226,9 @@ tests/data/asynth1.sw tests/vsynth%/00.pgm: TAG = GEN tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS) $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) +tools/lavfi-showfiltfmts$(EXESUF): tools/lavfi-showfiltfmts.o $(FF_DEP_LIBS) + $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) + include $(SRC_PATH_BARE)/tests/fate.mak include $(SRC_PATH_BARE)/tests/fate2.mak @@ -248,7 +251,7 @@ FATE = $(FATE_ACODEC) \ $(FATE_ACODEC): $(AREF) $(FATE_VCODEC): $(VREF) $(FATE_LAVF): $(REFS) -$(FATE_LAVFI): $(REFS) +$(FATE_LAVFI): $(REFS) tools/lavfi-showfiltfmts$(EXESUF) $(FATE_SEEK): fate-codec fate-lavf tests/seek_test$(EXESUF) $(FATE_ACODEC): CMD = codectest acodec diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index 9cd5a6ec3d..691b0f8540 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -66,15 +66,16 @@ vflip " if [ -n "$do_pixfmts_be" ] || [ -n "$do_pixfmts_le" ]; then + showfiltfmts="$target_exec $target_path/tools/lavfi-showfiltfmts" # exclude pixel formats which are not supported as input excluded_pix_fmts="$($ffmpeg -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^\..\.' | cut -d' ' -f2)" - scale_out_pix_fmts=$(tools/lavfi-showfiltfmts scale | grep "^OUTPUT" | cut -d: -f2) + scale_out_pix_fmts=$($showfiltfmts scale | grep "^OUTPUT" | cut -d: -f2) scale_out_pix_fmts=$(get_exclusive_elements "$scale_out_pix_fmts" "$excluded_pix_fmts") for filter_args in $filters_args; do filter=$(echo $filter_args | sed -e 's/\([^=]\+\)=.*/\1/') - in_pix_fmts=$(tools/lavfi-showfiltfmts $filter | grep "^INPUT" | cut -d: -f2) + in_pix_fmts=$($showfiltfmts $filter | grep "^INPUT" | cut -d: -f2) pix_fmts=$(get_common_elements "$in_pix_fmts" "$scale_out_pix_fmts") for pix_fmt in $pix_fmts; do |