Michael Niedermayer
16e25ef34b
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
avconv: extend -r to work on any input stream.
doc/avconv: expand documentation for the -s option.
avconv: don't print filters inserted by avconv in stream mappings.
avconv: merge configuration code for complex and simple filters
avconv: split configuring input filters out of configure_complex_filter
Conflicts:
configure
doc/ffmpeg.texi
ffmpeg.c
tests/ref/fate/idroq-video-encode
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-30 04:38:32 +02:00
2011-12-29 17:19:46 +01:00
2012-05-19 12:29:05 +02:00
2012-05-26 22:37:37 +02:00
2012-05-20 12:47:27 +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
2011-12-15 18:38:06 +01:00
2012-05-15 19:10:46 +02:00
2012-01-04 13:21:08 +01:00
2011-12-21 19:59:45 +01:00
2012-02-27 00:00:55 +01:00
2012-01-24 16:03:09 +01:00
2012-05-26 22:37:37 +02:00
2012-05-30 04:38:32 +02:00
2012-01-28 11:04:19 +01:00
2012-05-22 00:39:53 +02:00
2012-05-29 18:50:20 +02:00
2012-05-26 12:39:11 +02:00
2012-02-10 01:20:07 +01:00
2011-12-12 01:25:37 +01:00
2012-05-16 13:16:05 +02:00
2012-05-25 00:38:16 +02:00
2012-05-19 00:52:25 +02:00
2012-04-13 21:50:37 +02:00
2011-11-23 23:03:37 +01:00
2012-04-04 15:22:44 +02:00
2011-09-02 23:08:03 +02:00
2012-01-04 13:21:08 +01:00
2012-05-22 00:39:53 +02:00
2011-03-17 17:26:45 +01:00
2011-03-17 17:26:45 +01:00
2012-04-07 13:57:40 +02:00
2011-04-08 01:35:43 +02:00
2012-01-04 13:21:08 +01:00
2012-05-19 00:52:25 +02:00
2012-04-23 18:14:25 +02:00
2012-05-26 22:37:37 +02:00
2009-03-30 10:39:20 +00:00
2012-05-25 17:27:40 +02: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
2011-12-10 02:01:03 +01:00
2010-06-27 14:31:50 +00:00
2012-03-20 11:10:25 +00:00
2012-02-09 12:26:45 +01:00
16e25ef34b