diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 04:01:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 04:03:50 +0200 |
| commit | 4778783160fb8d7aa39dafdabc756f1691b830f7 (patch) | |
| tree | 4b79ab7e0bcefb304b8a4f3c32908d3217d6b4a9 /doc/filters.texi | |
| parent | dcd207c4cbcd9dd72b73e5b544c055b29885be64 (diff) | |
| parent | 3b266da3d35f3f7a61258b78384dfe920d875d29 (diff) | |
Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'
* commit '3b266da3d35f3f7a61258b78384dfe920d875d29':
avconv: add support for complex filtergraphs.
avconv: make filtergraphs global.
avconv: move filtered_frame from InputStream to OutputStream.
avconv: don't set output width/height directly from input value.
avconv: move resample_{width,height,pix_fmt} to InputStream.
avconv: remove a useless variable from OutputStream.
avconv: get output pixel format from lavfi.
graphparser: fix the order in which unlabeled input links are returned.
avconv: change {input,output}_{streams,files} into arrays of pointers.
avconv: don't pass input/output streams to some functions.
Conflicts:
cmdutils.c
cmdutils.h
doc/ffmpeg.texi
ffmpeg.c
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/filters.texi')
| -rw-r--r-- | doc/filters.texi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 08ed11cc73..346c8317e4 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -14,6 +14,7 @@ number of input and output pads of the filter. A filter with no input pads is called a "source", a filter with no output pads is called a "sink". +@anchor{Filtergraph syntax} @section Filtergraph syntax A filtergraph can be represented using a textual representation, which |