Michael Niedermayer 2fb0027c26 Merge commit '599b81ca9a8e04a27ddad94af462171d16063167' ... * commit '599b81ca9a8e04a27ddad94af462171d16063167': lavfi: add shuffleplanes filter Conflicts: Changelog doc/filters.texi libavfilter/Makefile libavfilter/allfilters.c libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-03-06 13:07:20 +01:00
..
examples	doc/examples/remuxing: dont use the input codec_tag, it may be invalid tor the output	2014-03-05 16:10:06 +01:00
APIchanges	doc/APIchanges: fill in missing version for "2013-11-14 - 31c09b7 / 728c465 - lavc 55.26.0 - vdpau.h"	2014-03-05 22:02:09 +01:00
Doxyfile	Merge commit 'e6c175dfd51e4b0e6deeae72cd8a161b22af3492'	2014-02-14 14:38:21 +01:00
Makefile	Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'	2014-02-25 20:26:00 +01:00
RELEASE_NOTES	update for 2.2	2014-03-01 03:34:59 +01:00
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 commit '599b81ca9a8e04a27ddad94af462171d16063167'	2014-03-06 13:07:20 +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	doc: git-howto: Leave reviewers time to react before pushing patches	2012-11-11 20:43:28 +01:00
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	Add "prefer_tcp" flag to "rtsp_flags"	2014-03-04 22:54:13 +01:00
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	…