The file is part of the FATE suite, so it belongs there.
---
.gitignore | 2 +-
tests/Makefile | 2 +-
tests/lavfi-regression.sh | 2 +-
tests/lavfi-showfiltfmts.c | 99 ++++++++++++++++++++++++++++++++++++++++++++
tools/lavfi-showfiltfmts.c | 99 --------------------------------------------
5 files changed, 102 insertions(+), 102 deletions(-)
create mode 100644 tests/lavfi-showfiltfmts.c
delete mode 100644 tools/lavfi-showfiltfmts.c
diff --git a/.gitignore b/.gitignore
index 59a0860..0c501c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ libswscale/libswscale*
tests/audiogen
tests/base64
tests/data
+tests/lavfi-showfiltfmts
tests/rotozoom
tests/seek_test
tests/tiny_psnr
@@ -37,7 +38,6 @@ tests/vsynth1
tests/vsynth2
tools/cws2fws
tools/graph2dot
-tools/lavfi-showfiltfmts
tools/pktdumper
tools/probetest
tools/qt-faststart
diff --git a/tests/Makefile b/tests/Makefile
index 77088c5..8a0c52d 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -60,7 +60,7 @@ FATE = $(FATE_ACODEC)
\
$(filter-out %-aref,$(FATE_ACODEC)): $(AREF)
$(filter-out %-vref,$(FATE_VCODEC)): $(VREF)
$(FATE_LAVF): $(REFS)
-$(FATE_LAVFI): $(REFS) tools/lavfi-showfiltfmts$(EXESUF)
+$(FATE_LAVFI): $(REFS) tests/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 8942756..6b034d7 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/tests/lavfi-showfiltfmts"
exclude_fmts=${outfile}${1}_exclude_fmts
out_fmts=${outfile}${1}_out_fmts
diff --git a/tests/lavfi-showfiltfmts.c b/tests/lavfi-showfiltfmts.c
new file mode 100644
index 0000000..30d4725
--- /dev/null
+++ b/tests/lavfi-showfiltfmts.c
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2009 Stefano Sabatini
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavformat/avformat.h"
+#include "libavutil/pixdesc.h"
+#include "libavfilter/avfilter.h"
+
+int main(int argc, char **argv)
+{
+ AVFilter *filter;
+ AVFilterContext *filter_ctx;
+ const char *filter_name;
+ const char *filter_args = NULL;
+ int i, j;
+
+ av_log_set_level(AV_LOG_DEBUG);
+
+ if (!argv[1]) {
+ fprintf(stderr, "Missing filter name as argument\n");
+ return 1;
+ }
+
+ filter_name = argv[1];
+ if (argv[2])
+ filter_args = argv[2];
+
+ avfilter_register_all();
+
+ /* get a corresponding filter and open it */
+ if (!(filter = avfilter_get_by_name(filter_name))) {
+ fprintf(stderr, "Unrecognized filter with name '%s'\n", filter_name);
+ return 1;
+ }
+
+ if (avfilter_open(&filter_ctx, filter, NULL) < 0) {
+ fprintf(stderr, "Inpossible to open filter with name '%s'\n",
filter_name);
+ return 1;
+ }
+ if (avfilter_init_filter(filter_ctx, filter_args, NULL) < 0) {
+ fprintf(stderr, "Impossible to init filter '%s' with arguments
'%s'\n", filter_name, filter_args);
+ return 1;
+ }
+
+ /* create a link for each of the input pads */
+ for (i = 0; i < filter_ctx->input_count; i++) {
+ AVFilterLink *link = av_mallocz(sizeof(AVFilterLink));
+ link->type = filter_ctx->filter->inputs[i].type;
+ filter_ctx->inputs[i] = link;
+ }
+ for (i = 0; i < filter_ctx->output_count; i++) {
+ AVFilterLink *link = av_mallocz(sizeof(AVFilterLink));
+ link->type = filter_ctx->filter->outputs[i].type;
+ filter_ctx->outputs[i] = link;
+ }
+
+ if (filter->query_formats)
+ filter->query_formats(filter_ctx);
+ else
+ avfilter_default_query_formats(filter_ctx);
+
+ /* print the supported formats in input */
+ for (i = 0; i < filter_ctx->input_count; i++) {
+ AVFilterFormats *fmts = filter_ctx->inputs[i]->out_formats;
+ for (j = 0; j < fmts->format_count; j++)
+ printf("INPUT[%d] %s: %s\n",
+ i, filter_ctx->filter->inputs[i].name,
+ av_pix_fmt_descriptors[fmts->formats[j]].name);
+ }
+
+ /* print the supported formats in output */
+ for (i = 0; i < filter_ctx->output_count; i++) {
+ AVFilterFormats *fmts = filter_ctx->outputs[i]->in_formats;
+ for (j = 0; j < fmts->format_count; j++)
+ printf("OUTPUT[%d] %s: %s\n",
+ i, filter_ctx->filter->outputs[i].name,
+ av_pix_fmt_descriptors[fmts->formats[j]].name);
+ }
+
+ avfilter_free(filter_ctx);
+ fflush(stdout);
+ return 0;
+}
diff --git a/tools/lavfi-showfiltfmts.c b/tools/lavfi-showfiltfmts.c
deleted file mode 100644
index 30d4725..0000000
--- a/tools/lavfi-showfiltfmts.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2009 Stefano Sabatini
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "libavformat/avformat.h"
-#include "libavutil/pixdesc.h"
-#include "libavfilter/avfilter.h"
-
-int main(int argc, char **argv)
-{
- AVFilter *filter;
- AVFilterContext *filter_ctx;
- const char *filter_name;
- const char *filter_args = NULL;
- int i, j;
-
- av_log_set_level(AV_LOG_DEBUG);
-
- if (!argv[1]) {
- fprintf(stderr, "Missing filter name as argument\n");
- return 1;
- }
-
- filter_name = argv[1];
- if (argv[2])
- filter_args = argv[2];
-
- avfilter_register_all();
-
- /* get a corresponding filter and open it */
- if (!(filter = avfilter_get_by_name(filter_name))) {
- fprintf(stderr, "Unrecognized filter with name '%s'\n", filter_name);
- return 1;
- }
-
- if (avfilter_open(&filter_ctx, filter, NULL) < 0) {
- fprintf(stderr, "Inpossible to open filter with name '%s'\n",
filter_name);
- return 1;
- }
- if (avfilter_init_filter(filter_ctx, filter_args, NULL) < 0) {
- fprintf(stderr, "Impossible to init filter '%s' with arguments
'%s'\n", filter_name, filter_args);
- return 1;
- }
-
- /* create a link for each of the input pads */
- for (i = 0; i < filter_ctx->input_count; i++) {
- AVFilterLink *link = av_mallocz(sizeof(AVFilterLink));
- link->type = filter_ctx->filter->inputs[i].type;
- filter_ctx->inputs[i] = link;
- }
- for (i = 0; i < filter_ctx->output_count; i++) {
- AVFilterLink *link = av_mallocz(sizeof(AVFilterLink));
- link->type = filter_ctx->filter->outputs[i].type;
- filter_ctx->outputs[i] = link;
- }
-
- if (filter->query_formats)
- filter->query_formats(filter_ctx);
- else
- avfilter_default_query_formats(filter_ctx);
-
- /* print the supported formats in input */
- for (i = 0; i < filter_ctx->input_count; i++) {
- AVFilterFormats *fmts = filter_ctx->inputs[i]->out_formats;
- for (j = 0; j < fmts->format_count; j++)
- printf("INPUT[%d] %s: %s\n",
- i, filter_ctx->filter->inputs[i].name,
- av_pix_fmt_descriptors[fmts->formats[j]].name);
- }
-
- /* print the supported formats in output */
- for (i = 0; i < filter_ctx->output_count; i++) {
- AVFilterFormats *fmts = filter_ctx->outputs[i]->in_formats;
- for (j = 0; j < fmts->format_count; j++)
- printf("OUTPUT[%d] %s: %s\n",
- i, filter_ctx->filter->outputs[i].name,
- av_pix_fmt_descriptors[fmts->formats[j]].name);
- }
-
- avfilter_free(filter_ctx);
- fflush(stdout);
- return 0;
-}
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
