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
..
fate	Merge remote-tracking branch 'qatar/master'	2012-05-30 04:38:32 +02:00
lavf	af_aresample: fix rounding that led to sample accumulation in the buffers.	2012-05-18 22:57:02 +02:00
lavf-fate	latmenc: copy pce config from proper location.	2012-04-12 20:28:37 +02:00
lavfi	tests/lavfi: use do_lavfi_pixfmts for the pixdesctest test	2012-05-26 12:02:30 +02:00
seek	Merge commit 'f919cc7df6'	2012-05-30 01:40:54 +02:00
vsynth1	Merge commit 'f919cc7df6'	2012-05-30 01:40:54 +02:00
vsynth2	Merge commit 'f919cc7df6'	2012-05-30 01:40:54 +02:00