diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 15:16:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 15:34:49 +0200 |
| commit | a33ed6bc74b6b8ada925c76c4084afcf8870a048 (patch) | |
| tree | 605fa1fc8e55698f892837e7d0191da5e5c34c1c /tools | |
| parent | f391e405dfde35bfb3fea9ccc09bd67b5cc0a8f2 (diff) | |
| parent | b7f1010c8fce09096057528f7cd29589ea1ae7df (diff) | |
| download | ffmpeg-a33ed6bc74b6b8ada925c76c4084afcf8870a048.tar.gz | |
Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'
* commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df':
tools: do not use av_pix_fmt_descriptors directly.
pixdesc: add functions for accessing pixel format descriptors.
build: add support for Tru64 (OSF/1)
md5: Allocate a normal private context for the opaque md5 context pointer
Conflicts:
cmdutils.c
doc/APIchanges
ffprobe.c
libavformat/md5enc.c
libavutil/version.h
tools/graph2dot.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/graph2dot.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/graph2dot.c b/tools/graph2dot.c index c4a50a8278..4a30beb754 100644 --- a/tools/graph2dot.c +++ b/tools/graph2dot.c @@ -82,9 +82,10 @@ static void print_digraph(FILE *outfile, AVFilterGraph *graph) link->srcpad->name, link->dstpad->name); if (link->type == AVMEDIA_TYPE_VIDEO) { + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format); fprintf(outfile, "fmt:%s w:%d h:%d tb:%d/%d", - av_pix_fmt_descriptors[link->format].name, + desc->name, link->w, link->h, link->time_base.num, link->time_base.den); } else if (link->type == AVMEDIA_TYPE_AUDIO) { |