1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
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
..
2012-02-26 07:48:45 +01:00
2012-05-08 16:53:03 +02:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
caf
2012-05-14 13:05:30 +01:00
2012-05-10 04:17:03 +02:00
2012-03-12 17:01:58 +02:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
crc
2012-05-15 19:47:18 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-04-01 11:01:08 +02:00
2012-03-02 18:58:19 +02:00
2012-02-26 07:48:45 +01:00
2012-03-27 17:54:04 -07:00
2012-03-23 14:03:03 -07:00
2012-03-20 14:12:53 -04:00
md5
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
mtv
2012-05-15 11:16:34 +02:00
2012-05-14 12:50:01 +01:00
2012-02-26 07:48:45 +01:00
2012-04-01 15:56:08 -04:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
sha
smc
2012-02-26 07:48:45 +01:00
2012-05-17 03:29:21 +02:00
2012-05-15 00:03:40 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-03-03 17:03:26 -05:00
w64
2012-02-26 07:48:45 +01:00
2012-03-22 19:52:56 +01:00