diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-21 12:59:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-21 12:59:38 +0100 |
| commit | 6b8f21190d5a01ee68103f77ccef59c709c7d75e (patch) | |
| tree | 18012c9eacd646d49ef43796ab7d35fbfff01f5d /doc/filters.texi | |
| parent | 9fa5a47197c6ef5489b04470b8369da33db40824 (diff) | |
| parent | a0a1ac0f091d390cbbb73c90e1b6a4a18cf0f50a (diff) | |
| download | ffmpeg-6b8f21190d5a01ee68103f77ccef59c709c7d75e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dxva2: Add missing #define to make header compile standalone
arm: vp8: Add missing #includes for header to compile standalone
doc: filters: Correct BNF FILTER description
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/filters.texi')
| -rw-r--r-- | doc/filters.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 152afb3bb7..d2ae1eadc0 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -179,7 +179,7 @@ Follows a BNF description for the filtergraph syntax: @var{LINKLABEL} ::= "[" @var{NAME} "]" @var{LINKLABELS} ::= @var{LINKLABEL} [@var{LINKLABELS}] @var{FILTER_ARGUMENTS} ::= sequence of chars (eventually quoted) -@var{FILTER} ::= [@var{LINKNAMES}] @var{NAME} ["=" @var{ARGUMENTS}] [@var{LINKNAMES}] +@var{FILTER} ::= [@var{LINKLABELS}] @var{NAME} ["=" @var{FILTER_ARGUMENTS}] [@var{LINKLABELS}] @var{FILTERCHAIN} ::= @var{FILTER} [,@var{FILTERCHAIN}] @var{FILTERGRAPH} ::= [sws_flags=@var{flags};] @var{FILTERCHAIN} [;@var{FILTERGRAPH}] @end example |