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>

.gitignore

@@ -42,7 +42,6 @@
 /tools/cws2fws
 /tools/graph2dot
 /tools/ismindex
-/tools/lavfi-showfiltfmts
 /tools/pktdumper
 /tools/probetest
 /tools/qt-faststart

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

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;

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

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