diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-18 17:43:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-18 17:43:43 +0100 |
| commit | 330e440706665d91f36f180f25fa096a8b3e7ed4 (patch) | |
| tree | ca9e7fe58b74cc4d7f9ad04427faff8a311ff40d /doc/print_options.c | |
| parent | 523c8e0503dcf99f67ea909dea2ca5e56d9ff091 (diff) | |
| parent | 358628074c314c8ec6d433a740e9176e7aefa124 (diff) | |
| download | ffmpeg-330e440706665d91f36f180f25fa096a8b3e7ed4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
print_options: do not generate docs for options without enc or dec flags
mpeg12: do not fail on zero dimensions in the sequence header.
Conflicts:
libavcodec/mpeg12.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/print_options.c')
| -rw-r--r-- | doc/print_options.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/print_options.c b/doc/print_options.c index 339b942fb8..c369cfdb3b 100644 --- a/doc/print_options.c +++ b/doc/print_options.c @@ -39,6 +39,9 @@ static void print_usage(void) static void print_option(const AVOption *opts, const AVOption *o, int per_stream) { + if (!(o->flags & (AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_ENCODING_PARAM))) + return; + printf("@item -%s%s @var{", o->name, per_stream ? "[:stream_specifier]" : ""); switch (o->type) { case AV_OPT_TYPE_BINARY: printf("hexadecimal string"); break; |