Michael Niedermayer
411cc5c46a
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>
2011-09-12 00:32:54 +02:00
..
2011-09-05 22:29:16 +02:00
2011-09-11 17:44:20 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-09-01 16:35:38 -07:00
2011-07-07 22:47:24 +02:00
2011-09-04 13:12:00 +02:00
2011-09-05 22:29:16 +02:00
2011-03-19 13:35:52 +00:00
2011-09-04 13:12:00 +02:00
2011-05-20 13:50:52 +01:00
2011-08-01 11:36:16 +02:00
2011-08-01 11:36:16 +02:00
2011-08-01 11:36:16 +02:00
2011-09-12 00:32:54 +02:00
2011-08-13 02:56:08 +02:00
2003-04-11 13:43:17 +00:00
2011-08-30 18:16:03 +02:00
2011-01-18 20:48:24 +00:00
2011-08-16 20:59:14 +02:00
2011-05-12 04:51:24 +02:00
2011-04-29 18:08:46 +02:00
2011-03-19 13:33:20 +00:00