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