diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-11 23:35:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-12 00:32:54 +0200 |
| commit | 411cc5c46a89ce0a79832c37d0eab1ed884e5423 (patch) | |
| tree | 0217179f24cd9629b568b521b1c749e51d6ea7c9 /doc/ffmpeg.texi | |
| parent | 5a6f4a130226e04e0db3bd7c7c1ff76fe3f06080 (diff) | |
| parent | 6cfed1127005e9d79e03b4b04fd75124a291d3db (diff) | |
| download | ffmpeg-411cc5c46a89ce0a79832c37d0eab1ed884e5423.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (31 commits)
audioconvert: add explanatory comments to channel_names array
audioconvert: K&R whitespace cosmetics
avconv: use correct index when selecting metadata to write to.
avconv: fix inverted variable
doc/avconv: document option types (input/output/per-stream/...)
doc/avtools-common-opts: write a section about stream specifiers.
doc/avconv: remove two pointless paragraphs.
doc/avconv: document that global options should be specified first.
doc/avconv: remove entries for nonexistent options
doc/avconv: remove documentation for removed 'timestamp' option
doc: cosmetics, rename fftools-common-opts to avtools-....
avconv: move streamid_map to options context.
avconv: extend -vf syntax
avconv: move top_field_first to options context.
avconv: move inter/intra matrix to options context.
avconv: remove -psnr option.
avconv: remove me_threshold option.
avconv: move video_rc_override_string to options context.
avconv: move frame pixel format to the options context.
avconv: move frame aspect ratio to the options context.
...
Conflicts:
avconv.c
cmdutils_common_opts.h
doc/avconv.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg.texi')
| -rw-r--r-- | doc/ffmpeg.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index f3ca854dd3..bb596cca4a 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -68,7 +68,7 @@ specified for the inputs. @chapter Options @c man begin OPTIONS -@include fftools-common-opts.texi +@include avtools-common-opts.texi @section Main options |