Michael Niedermayer 1f2bacc897 Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a' ... * commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a': libavfilter: example audio filtering program Conflicts: .gitignore configure doc/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-02-25 20:26:00 +01:00
..
examples	Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'	2014-02-25 20:26:00 +01:00
APIchanges	Merge commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9'	2014-02-24 22:19:41 +01:00
Doxyfile	…
Makefile	Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'	2014-02-25 20:26:00 +01:00
RELEASE_NOTES	…
authors.texi	…
bitstream_filters.texi	…
build_system.txt	…
codecs.texi	…
decoders.texi	…
default.css	…
demuxers.texi	…
developer.texi	…
devices.texi	…
doxy-wrapper.sh	Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'	2014-02-17 02:22:01 +01:00
encoders.texi	…
errno.txt	…
faq.texi	…
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	Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'	2014-02-24 09:15:46 +01:00
ffmpeg.txt	…
ffplay.texi	…
ffprobe.texi	…
ffprobe.xsd	…
ffserver.conf	…
ffserver.texi	…
fftools-common-opts.texi	…
filter_design.txt	…
filters.texi	Merge remote-tracking branch 'qatar/master'	2014-02-24 22:29:24 +01:00
formats.texi	avformat/options_table: add named constants for avoid_negative_ts	2014-02-24 19:46:11 +01:00
general.texi	doc: Fix project name typo	2014-02-16 22:08:21 +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	Merge commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd'	2014-02-19 22:09:10 +01:00
nut.texi	…
optimization.txt	…
outdevs.texi	…
platform.texi	…
print_options.c	…
protocols.texi	…
rate_distortion.txt	…
resampler.texi	…
scaler.texi	…
snow.txt	…
swresample.txt	…
swscale.txt	…
t2h.init	…
tablegen.txt	…
texi2pod.pl	Merge remote-tracking branch 'qatar/master'	2014-02-25 09:02:57 +01:00
texidep.pl	…
utils.texi	…