mirror of https://git.ffmpeg.org/ffmpeg.git
16e25ef34b
* 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> |
||
---|---|---|
.. | ||
doxy | ||
examples | ||
APIchanges | ||
Makefile | ||
RELEASE_NOTES | ||
avtools-common-opts.texi | ||
avutil.txt | ||
bitstream_filters.texi | ||
build_system.txt | ||
decoders.texi | ||
demuxers.texi | ||
developer.texi | ||
encoders.texi | ||
errno.txt | ||
eval.texi | ||
faq.texi | ||
fate.texi | ||
ffmpeg.texi | ||
ffmpeg.txt | ||
ffplay.texi | ||
ffprobe.texi | ||
ffprobe.xsd | ||
ffserver.conf | ||
ffserver.texi | ||
filter_design.txt | ||
filters.texi | ||
general.texi | ||
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 | ||
print_options.c | ||
protocols.texi | ||
rate_distortion.txt | ||
snow.txt | ||
soc.txt | ||
swresample.txt | ||
swscale.txt | ||
syntax.texi | ||
t2h.init | ||
tablegen.txt | ||
texi2pod.pl | ||
viterbi.txt |