[FFmpeg-cvslog] lavfi: reclassify showfiltfmts as a TESTPROG

[Mans Rullgard]

ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Wed Jul  4 16:51:10 2012 +0100| [7c29377b702783680b223a12503df784b1808086] | committer: Mans Rullgard

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 at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c29377b702783680b223a12503df784b1808086
---

 .gitignore                                           |    1 -
 libavfilter/Makefile                                 |    4 ++--
 tools/lavfi-showfiltfmts.c => libavfilter/filtfmts.c |    5 +++++
 tests/Makefile                                       |    2 +-
 tests/lavfi-regression.sh                            |    2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6fe9434..56b3040 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 b789609..530aa57 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
similarity index 98%
rename from tools/lavfi-showfiltfmts.c
rename to libavfilter/filtfmts.c
index 146f0cd..8b23c7b 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 6fe4ed3..91f2d49 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 f8c0c4e..a315e72 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