diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-07-04 16:51:10 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-07-04 17:48:25 +0100 |
| commit | 7c29377b702783680b223a12503df784b1808086 (patch) | |
| tree | aa4a462a972e9bf6f3c848fc8b47cf207b4912e5 | |
| parent | fa2d7473528c601c1076957d474ab7550d588828 (diff) | |
| download | ffmpeg-7c29377b702783680b223a12503df784b1808086.tar.gz | |
lavfi: reclassify showfiltfmts as a TESTPROG
This tool uses lavfi internal symbols not accessible in shared
libraries. TESTPROGS are linked statically to allow them use of
library internals not normally exported.
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | libavfilter/Makefile | 4 | ||||
| -rw-r--r-- | libavfilter/filtfmts.c (renamed from tools/lavfi-showfiltfmts.c) | 5 | ||||
| -rw-r--r-- | tests/Makefile | 2 | ||||
| -rwxr-xr-x | tests/lavfi-regression.sh | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 6fe94349d0..56b304070d 100644 --- a/.gitignore +++ b/.gitignore @@ -42,7 +42,6 @@ /tools/cws2fws /tools/graph2dot /tools/ismindex -/tools/lavfi-showfiltfmts /tools/pktdumper /tools/probetest /tools/qt-faststart diff --git a/libavfilter/Makefile b/libavfilter/Makefile index b78960932f..530aa576ae 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -89,5 +89,5 @@ OBJS-$(CONFIG_TESTSRC_FILTER) += vsrc_testsrc.o OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o -TOOLS = graph2dot \ - lavfi-showfiltfmts \ +TOOLS = graph2dot +TESTPROGS = filtfmts diff --git a/tools/lavfi-showfiltfmts.c b/libavfilter/filtfmts.c index 146f0cd081..8b23c7b844 100644 --- a/tools/lavfi-showfiltfmts.c +++ b/libavfilter/filtfmts.c @@ -18,11 +18,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdio.h> + #include "libavformat/avformat.h" #include "libavutil/pixdesc.h" #include "libavfilter/avfilter.h" #include "libavfilter/formats.h" +#undef fprintf +#undef printf + int main(int argc, char **argv) { AVFilter *filter; diff --git a/tests/Makefile b/tests/Makefile index 6fe4ed3923..91f2d49b19 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -92,7 +92,7 @@ FATE += $(FATE_LIBAVUTIL) $(FATE_AVCONV) $(FATE_SAMPLES_AVCONV): avconv$(EXESUF) $(FATE_LAVF): $(AREF) $(VREF) -$(FATE_LAVFI): $(VREF) tools/lavfi-showfiltfmts$(EXESUF) +$(FATE_LAVFI): $(VREF) libavfilter/filtfmts-test$(EXESUF) $(FATE_SEEK): fate-acodec fate-vsynth2 fate-lavf libavformat/seek-test$(EXESUF) $(FATE_LAVF): CMD = lavftest diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index f8c0c4e75b..a315e725ea 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -44,7 +44,7 @@ do_lavfi_pixfmts(){ filter=$1 filter_args=$2 - showfiltfmts="$target_exec $target_path/tools/lavfi-showfiltfmts" + showfiltfmts="$target_exec $target_path/libavfilter/filtfmts-test" exclude_fmts=${outfile}${1}_exclude_fmts out_fmts=${outfile}${1}_out_fmts |