| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-07 09:35:59 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-07 09:35:59 (GMT) |
| commit | b7ce510003275460a9b02361a8c98bfec6fa2945 (patch) | |
| tree | 724100234911165f50bce4621ba25cb5eb5e5d9e | |
| parent | 7bd417c22a90a712df57cacfa5b09c1fb4f6183a (diff) | |
| parent | a4baf96abd64cda68e3e4692b182bdf60745a14d (diff) | |
| download | ffmpeg-b7ce510003275460a9b02361a8c98bfec6fa2945.zip ffmpeg-b7ce510003275460a9b02361a8c98bfec6fa2945.tar.gz ffmpeg-b7ce510003275460a9b02361a8c98bfec6fa2945.tar.bz2 | |
Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d'
* commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d':
avprobe: rename the prettyprint structures
tools: Wording and formatting cosmetics
Conflicts:
avprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tools/graph2dot.c | 8 | ||||
| -rw-r--r-- | tools/pktdumper.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tools/graph2dot.c b/tools/graph2dot.c index 167c49b..2daceb6 100644 --- a/tools/graph2dot.c +++ b/tools/graph2dot.c @@ -36,7 +36,7 @@ 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" @@ -137,7 +137,7 @@ int main(int argc, char **argv) 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; } @@ -146,7 +146,7 @@ int main(int argc, char **argv) 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; } @@ -179,7 +179,7 @@ int main(int argc, char **argv) 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; } diff --git a/tools/pktdumper.c b/tools/pktdumper.c index 920397b..61cb5cc 100644 --- a/tools/pktdumper.c +++ b/tools/pktdumper.c @@ -31,18 +31,18 @@ #include <io.h> #endif -#define FILENAME_BUF_SIZE 4096 - #include "libavutil/avstring.h" #include "libavutil/time.h" #include "libavformat/avformat.h" +#define FILENAME_BUF_SIZE 4096 #define PKTFILESUFF "_%08" PRId64 "_%02d_%010" PRId64 "_%06d_%c.bin" static int usage(int ret) { - fprintf(stderr, "dump (up to maxpkts) AVPackets as they are demuxed by libavformat.\n"); - fprintf(stderr, "each packet is dumped in its own file named like `basename file.ext`_$PKTNUM_$STREAMINDEX_$STAMP_$SIZE_$FLAGS.bin\n"); + fprintf(stderr, "Dump (up to maxpkts) AVPackets as they are demuxed by libavformat.\n"); + fprintf(stderr, "Each packet is dumped in its own file named like\n"); + fprintf(stderr, "$(basename file.ext)_$PKTNUM_$STREAMINDEX_$STAMP_$SIZE_$FLAGS.bin\n"); fprintf(stderr, "pktdumper [-nw] file [maxpkts]\n"); fprintf(stderr, "-n\twrite No file at all, only demux.\n"); fprintf(stderr, "-w\tWait at end of processing instead of quitting.\n"); @@ -79,7 +79,7 @@ int main(int argc, char **argv) if (strrchr(fntemplate, '.')) *strrchr(fntemplate, '.') = '\0'; if (strchr(fntemplate, '%')) { - fprintf(stderr, "can't use filenames containing '%%'\n"); + fprintf(stderr, "cannot use filenames containing '%%'\n"); return usage(1); } if (strlen(fntemplate) + sizeof(PKTFILESUFF) >= sizeof(fntemplate) - 1) { |