Michael Niedermayer
aee51039ee
Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'
* commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174':
avconv: print info/capabilities options in a separate help group.
avtools: add -h demuxer/muxer
cmdutils: extend -h to allow printing codec details.
Conflicts:
cmdutils.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
ffserver.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-20 17:06:50 +02:00
..
2011-12-29 17:19:46 +01:00
2012-08-16 16:20:30 +02:00
2012-08-15 22:32:06 +03:00
2012-08-20 17:06:50 +02:00
2011-05-11 13:43:30 +02:00
2012-02-25 04:00:43 +01:00
2012-02-09 12:26:45 +01:00
2011-12-15 18:38:04 +01:00
2012-08-08 23:43:36 +02:00
2012-08-17 17:06:52 +02:00
2012-06-13 11:33:00 +02:00
2011-12-21 19:59:45 +01:00
2012-07-04 21:03:28 +02:00
2012-07-28 18:16:55 +02:00
2012-07-05 10:55:49 +02:00
2012-08-20 16:55:08 +02:00
2012-01-28 11:04:19 +01:00
2012-05-22 00:39:53 +02:00
2012-06-18 09:38:36 +02:00
2012-07-31 15:06:57 +02:00
2012-02-10 01:20:07 +01:00
2011-12-12 01:25:37 +01:00
2012-08-14 12:12:20 +02:00
2012-08-19 11:37:05 +02:00
2012-08-14 16:54:25 +02:00
2012-07-24 21:15:57 +02:00
2011-11-23 23:03:37 +01:00
2012-08-08 23:43:37 +02:00
2011-09-02 23:08:03 +02:00
2012-08-18 10:04:25 +02:00
2011-03-17 17:26:45 +01:00
2012-08-17 18:54:50 +02:00
2011-03-17 17:26:45 +01:00
2012-08-18 12:32:54 +02:00
2011-04-08 01:35:43 +02:00
2012-07-22 10:31:33 +02:00
2012-08-10 16:25:23 +02:00
2012-04-23 18:14:25 +02:00
2012-08-17 17:06:52 +02:00
2009-03-30 10:39:20 +00:00
2012-05-25 17:27:40 +02:00
2008-02-08 19:17:46 +00:00
2011-12-12 01:25:37 +01:00
2012-03-13 01:14:04 +01:00
2012-02-09 12:26:45 +01:00
2012-05-29 07:40:58 +02:00
2012-07-22 12:48:57 +02:00
2010-06-27 14:31:50 +00:00
2012-08-12 23:52:55 +02:00
2012-02-09 12:26:45 +01:00