ffmpeg/doc
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
..
doxy
examples doc/examples: make use of the parameter filters_descr parameter in init_filters(). 2012-05-19 12:29:05 +02:00
APIchanges Merge remote-tracking branch 'qatar/master' 2012-05-26 22:37:37 +02:00
Makefile doc: add syntax.texi file 2012-05-22 00:39:53 +02:00
RELEASE_NOTES release_notes: update 2012-05-25 17:27:40 +02:00
avtools-common-opts.texi cmdutils: allow to specify a stream by its ID. 2012-05-20 12:47:27 +02:00
avutil.txt
bitstream_filters.texi
build_system.txt
decoders.texi
demuxers.texi
developer.texi build: Add 'check' target to run all compile and test targets. 2012-05-15 19:10:46 +02:00
encoders.texi
errno.txt
eval.texi
faq.texi
fate.texi Merge remote-tracking branch 'qatar/master' 2012-05-26 22:37:37 +02:00
ffmpeg.texi Merge remote-tracking branch 'qatar/master' 2012-05-30 04:38:32 +02:00
ffmpeg.txt
ffplay.texi doc: add syntax.texi file 2012-05-22 00:39:53 +02:00
ffprobe.texi ffprobe: make -of an alias for -print_format. 2012-05-29 18:50:20 +02:00
ffprobe.xsd ffprobe: display the codec profile in show_stream() 2012-05-26 12:39:11 +02:00
ffserver.conf
ffserver.texi
filter_design.txt lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
filters.texi Merge remote-tracking branch 'qatar/master' 2012-05-25 00:38:16 +02:00
general.texi Merge remote-tracking branch 'qatar/master' 2012-05-19 00:52:25 +02:00
git-howto.texi
git-howto.txt
indevs.texi
issue_tracker.txt
libavfilter.texi
metadata.texi
multithreading.txt
muxers.texi
optimization.txt
outdevs.texi
platform.texi Merge remote-tracking branch 'qatar/master' 2012-05-19 00:52:25 +02:00
print_options.c
protocols.texi Merge remote-tracking branch 'qatar/master' 2012-05-26 22:37:37 +02:00
rate_distortion.txt
snow.txt
soc.txt
swresample.txt
swscale.txt
syntax.texi doc/syntax: escape '@' to fix a warning. 2012-05-29 07:40:58 +02:00
t2h.init
tablegen.txt
texi2pod.pl
viterbi.txt