git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure: Fix typo in objcc default setting
[ffmpeg.git]
/
tools
/
graph2dot.c
diff --git
a/tools/graph2dot.c
b/tools/graph2dot.c
index
6ea2f32
..
fbf8902
100644
(file)
--- a/
tools/graph2dot.c
+++ b/
tools/graph2dot.c
@@
-18,15
+18,25
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+#if HAVE_UNISTD_H
#include <unistd.h> /* getopt */
#include <unistd.h> /* getopt */
+#endif
+#include <stdio.h>
+#include <string.h>
+#include "libavutil/channel_layout.h"
+#include "libavutil/mem.h"
#include "libavutil/pixdesc.h"
#include "libavutil/pixdesc.h"
-#include "libavutil/audioconvert.h"
-#include "libavfilter/avfiltergraph.h"
+#include "libavfilter/avfilter.h"
+
+#if !HAVE_GETOPT
+#include "compat/getopt.c"
+#endif
static void usage(void)
{
static void usage(void)
{
- printf("Convert a libavfilter graph to a dot file\n");
+ printf("Convert a libavfilter graph to a dot file
.
\n");
printf("Usage: graph2dot [OPTIONS]\n");
printf("\n"
"Options:\n"
printf("Usage: graph2dot [OPTIONS]\n");
printf("\n"
"Options:\n"
@@
-48,7
+58,7
@@
static void print_digraph(FILE *outfile, AVFilterGraph *graph)
fprintf(outfile, "node [shape=box]\n");
fprintf(outfile, "rankdir=LR\n");
fprintf(outfile, "node [shape=box]\n");
fprintf(outfile, "rankdir=LR\n");
- for (i = 0; i < graph->
filter_count
; i++) {
+ for (i = 0; i < graph->
nb_filters
; i++) {
char filter_ctx_label[128];
const AVFilterContext *filter_ctx = graph->filters[i];
char filter_ctx_label[128];
const AVFilterContext *filter_ctx = graph->filters[i];
@@
-56,7
+66,7
@@
static void print_digraph(FILE *outfile, AVFilterGraph *graph)
filter_ctx->name,
filter_ctx->filter->name);
filter_ctx->name,
filter_ctx->filter->name);
- for (j = 0; j < filter_ctx->
output_count
; j++) {
+ for (j = 0; j < filter_ctx->
nb_outputs
; j++) {
AVFilterLink *link = filter_ctx->outputs[j];
if (link) {
char dst_filter_ctx_label[128];
AVFilterLink *link = filter_ctx->outputs[j];
if (link) {
char dst_filter_ctx_label[128];
@@
-70,10
+80,10
@@
static void print_digraph(FILE *outfile, AVFilterGraph *graph)
fprintf(outfile, "\"%s\" -> \"%s\"",
filter_ctx_label, dst_filter_ctx_label);
if (link->type == AVMEDIA_TYPE_VIDEO) {
fprintf(outfile, "\"%s\" -> \"%s\"",
filter_ctx_label, dst_filter_ctx_label);
if (link->type == AVMEDIA_TYPE_VIDEO) {
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format);
fprintf(outfile,
" [ label= \"fmt:%s w:%d h:%d tb:%d/%d\" ]",
fprintf(outfile,
" [ label= \"fmt:%s w:%d h:%d tb:%d/%d\" ]",
- av_pix_fmt_descriptors[link->format].name,
- link->w, link->h, link->time_base.num,
+ desc->name, link->w, link->h, link->time_base.num,
link->time_base.den);
} else if (link->type == AVMEDIA_TYPE_AUDIO) {
char buf[255];
link->time_base.den);
} else if (link->type == AVMEDIA_TYPE_AUDIO) {
char buf[255];
@@
-123,7
+133,7
@@
int main(int argc, char **argv)
infilename = "/dev/stdin";
infile = fopen(infilename, "r");
if (!infile) {
infilename = "/dev/stdin";
infile = fopen(infilename, "r");
if (!infile) {
- fprintf(stderr, "
Impossible
to open input file '%s': %s\n",
+ fprintf(stderr, "
Failed
to open input file '%s': %s\n",
infilename, strerror(errno));
return 1;
}
infilename, strerror(errno));
return 1;
}
@@
-132,7
+142,7
@@
int main(int argc, char **argv)
outfilename = "/dev/stdout";
outfile = fopen(outfilename, "w");
if (!outfile) {
outfilename = "/dev/stdout";
outfile = fopen(outfilename, "w");
if (!outfile) {
- fprintf(stderr, "
Impossible
to open output file '%s': %s\n",
+ fprintf(stderr, "
Failed
to open output file '%s': %s\n",
outfilename, strerror(errno));
return 1;
}
outfilename, strerror(errno));
return 1;
}
@@
-165,7
+175,7
@@
int main(int argc, char **argv)
avfilter_register_all();
if (avfilter_graph_parse(graph, graph_string, NULL, NULL, NULL) < 0) {
avfilter_register_all();
if (avfilter_graph_parse(graph, graph_string, NULL, NULL, NULL) < 0) {
- fprintf(stderr, "
Impossible
to parse the graph description\n");
+ fprintf(stderr, "
Failed
to parse the graph description\n");
return 1;
}
return 1;
}