Michael Niedermayer 905cd28a5a Merge commit 'de203abd71baae7f120313259b45cf935c85203e' ... * commit 'de203abd71baae7f120313259b45cf935c85203e': vf_overlay: add eof_action switch Conflicts: doc/filters.texi libavfilter/vf_overlay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-02-04 14:33:33 +01:00
..
examples	examples/avio_reading: remove stray empty line	2014-02-02 12:35:46 +01:00
APIchanges	doc/APIchanges: fix weird reindent	2014-02-02 13:16:28 +01:00
Doxyfile	…
Makefile	examples: add avio_reading.c example	2014-02-02 11:58:23 +01:00
RELEASE_NOTES	…
authors.texi	…
bitstream_filters.texi	…
build_system.txt	…
codecs.texi	doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all	2014-01-09 12:12:10 +01:00
decoders.texi	Merge commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7'	2014-01-30 15:19:51 +01:00
default.css	…
demuxers.texi	…
developer.texi	…
devices.texi	doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all	2014-01-09 12:12:10 +01:00
doxy-wrapper.sh	…
encoders.texi	Merge remote-tracking branch 'qatar/master'	2014-01-30 16:00:47 +01:00
errno.txt	…
faq.texi	doc/faq: remove "-profile option fails when encoding H.264 video with AAC audio" entry	2014-01-03 17:05:44 +01:00
fate.texi	…
fate_config.sh.template	…
ffmpeg-bitstream-filters.texi	…
ffmpeg-codecs.texi	…
ffmpeg-devices.texi	…
ffmpeg-filters.texi	…
ffmpeg-formats.texi	…
ffmpeg-protocols.texi	…
ffmpeg-resampler.texi	…
ffmpeg-scaler.texi	…
ffmpeg-utils.texi	…
ffmpeg.texi	doc/ffmpeg: reference time syntax sections in ffmpeg-utils for itsoffset and timestamp options	2014-01-24 12:20:46 +01:00
ffmpeg.txt	…
ffplay.texi	doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all	2014-01-09 12:12:10 +01:00
ffprobe.texi	doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all	2014-01-09 12:12:10 +01:00
ffprobe.xsd	…
ffserver.conf	…
ffserver.texi	…
fftools-common-opts.texi	…
filter_design.txt	…
filters.texi	Merge commit 'de203abd71baae7f120313259b45cf935c85203e'	2014-02-04 14:33:33 +01:00
formats.texi	lavf: add output_ts_offset option to AVFormatContext	2014-02-02 13:16:17 +01:00
general.texi	doc/general: update device and protocol status	2014-01-28 17:58:22 +01:00
git-howto.texi	…
indevs.texi	…
issue_tracker.txt	…
libavcodec.texi	…
libavdevice.texi	…
libavfilter.texi	…
libavformat.texi	…
libavutil.texi	…
libswresample.texi	…
libswscale.texi	…
metadata.texi	…
mips.txt	…
multithreading.txt	…
muxers.texi	doc/muxers: add "Options", "Examples", "Syntax", etc. subsections	2014-01-19 13:40:37 +01:00
nut.texi	…
optimization.txt	…
outdevs.texi	lavd: add opengl device	2014-01-27 15:18:18 +01:00
platform.texi	…
print_options.c	…
protocols.texi	lavf/libssh: add private_key option	2014-01-22 00:41:13 +01:00
rate_distortion.txt	…
resampler.texi	…
scaler.texi	…
snow.txt	…
swresample.txt	…
swscale.txt	…
t2h.init	…
tablegen.txt	…
texi2pod.pl	…
texidep.pl	…
utils.texi	…