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

..

x86

…

audioconvert.c

…

audioconvert.h

…

dither.c

…

libswresample.v

…

Makefile

…

rematrix_template.c

…

rematrix.c

…

resample_template.c

…

resample.c

…

swresample_internal.h

…

swresample_test.c

…

swresample.c

…

swresample.h

…