diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-07 14:47:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-07 14:47:49 +0200 |
| commit | a7908ac012ef60661765bda4550c02255d8265fd (patch) | |
| tree | 269f0640cecee7df9893fa0a47613fc0a04ae45c /doc/filters.texi | |
| parent | 9285f25e31a73900148b6fe6643ed82b055619cb (diff) | |
| parent | 9b79a05289d91d1184455d12e6c4df457f0657c4 (diff) | |
| download | ffmpeg-a7908ac012ef60661765bda4550c02255d8265fd.tar.gz | |
Merge commit '9b79a05289d91d1184455d12e6c4df457f0657c4' into release/0.10
* commit '9b79a05289d91d1184455d12e6c4df457f0657c4':
wmaprodec: return an error, not 0, when the input is too small.
vmdaudio: fix invalid reads when packet size is not a multiple of chunk size
vorbisdec: Error on bark_map_size equal to 0.
configure: clean up Altivec detection
Update RELEASE file for 0.8.6
update year to 2013
oggdec: make sure the private parse data is cleaned up (cherry picked from commit d894f74762bc95310ba23f804b7ba8dffc8f6646)
build: Fix CAF demuxer dependencies
doc: developer: Allow tabs in the vim configuration for Automake files
doc: filters: Correct BNF FILTER description
Conflicts:
RELEASE
cmdutils.c
libavcodec/vmdav.c
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 43eec40d16..ef10bcb9b2 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -82,7 +82,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} ::= @var{FILTERCHAIN} [;@var{FILTERGRAPH}] @end example |