diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-08 21:36:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-08 21:46:34 +0200 |
| commit | 52dc18d414f4aa2c5a210edfb82cc1a99942ca3b (patch) | |
| tree | c2aedd51f56ee49222c76f44b238c16102132db1 /doc/filters.texi | |
| parent | ac627b3d38d370027406c93c2dcaac0b1712a7d4 (diff) | |
| parent | 7e522859fc463a14875f78957bb57d2f33607d19 (diff) | |
| download | ffmpeg-52dc18d414f4aa2c5a210edfb82cc1a99942ca3b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86)
x86: cavs: call ff_cavsdsp_init_x86() under if (ARCH_X86)
x86: call most of the x86 dsp init functions under if (ARCH_X86)
doc: support the new website layout
doc: remove a warning from filters.texi
doc: initial nut documentation
segment: drop global headers setting
lavu: fix typo in Makefile
Conflicts:
doc/Makefile
doc/filters.texi
doc/t2h.init
libavcodec/fmtconvert.c
libavcodec/proresdsp.c
libavcodec/x86/Makefile
libavcodec/x86/vc1dsp_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/filters.texi')
| -rw-r--r-- | doc/filters.texi | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index f7f9ee70b1..725c7b5d84 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -2446,14 +2446,10 @@ corresponding pixel component values. The @var{lut} filter requires either YUV or RGB pixel formats in input, and accepts the options: @table @option -@item c0 -first pixel component -@item c1 -second pixel component -@item c2 -third pixel component -@item c3 -fourth pixel component, corresponds to the alpha component +@item @var{c0} (first pixel component) +@item @var{c1} (second pixel component) +@item @var{c2} (third pixel component) +@item @var{c3} (fourth pixel component, corresponds to the alpha component) @end table The exact component associated to each option depends on the format in @@ -2462,27 +2458,19 @@ input. The @var{lutrgb} filter requires RGB pixel formats in input, and accepts the options: @table @option -@item r -red component -@item g -green component -@item b -blue component -@item a -alpha component +@item @var{r} (red component) +@item @var{g} (green component) +@item @var{b} (blue component) +@item @var{a} (alpha component) @end table The @var{lutyuv} filter requires YUV pixel formats in input, and accepts the options: @table @option -@item y -Y/luminance component -@item u -U/Cb component -@item v -V/Cr component -@item a -alpha component +@item @var{y} (Y/luminance component) +@item @var{u} (U/Cb component) +@item @var{v} (V/Cr component) +@item @var{a} (alpha component) @end table The expressions can contain the following constants and functions: |