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-07-27 02:05:49 +02:00
2011-09-06 18:51:09 +02:00
2011-09-12 00:32:54 +02:00
2011-09-12 00:32:54 +02:00
2011-05-11 13:43:30 +02:00
2011-03-17 17:26:45 +01:00
2011-03-29 02:27:13 +02:00
2011-05-20 10:14:00 +02:00
2011-08-09 19:56:21 +02:00
2011-08-23 04:34:14 +02:00
2011-06-02 14:43:29 +02:00
2011-06-07 00:37:00 +02:00
2011-09-12 00:32:54 +02:00
2011-05-27 10:41:46 +02:00
2011-04-19 01:17:59 +02:00
2011-09-12 00:32:54 +02:00
2011-09-12 00:32:54 +02:00
2011-09-12 00:32:54 +02:00
2011-08-09 19:56:25 +02:00
2011-09-12 00:32:54 +02:00
2011-09-07 04:18:43 +02:00
2011-09-07 22:58:39 +02:00
2011-04-10 04:31:54 +02:00
2011-08-11 17:32:54 +02:00
2011-09-02 23:08:03 +02:00
2011-09-10 23:40:52 +02:00
2011-06-29 09:14:56 +01:00
2011-03-17 17:26:45 +01:00
2011-03-17 17:26:45 +01:00
2011-07-10 04:28:50 +02:00
2011-04-08 01:35:43 +02:00
2011-06-05 13:17:38 +02:00
2011-08-09 19:56:21 +02:00
2009-03-30 10:39:20 +00:00
2011-06-21 20:58:39 +02:00
2008-02-08 19:17:46 +00:00
2011-03-17 17:26:45 +01:00
2010-03-05 08:34:31 +00:00
2011-01-30 03:41:47 +01:00
2010-06-27 14:31:50 +00:00
2011-07-09 21:53:59 +02:00
2009-03-03 15:35:20 +00:00