ffmpeg/tests/fate
Michael Niedermayer 3319679d0a Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'
* commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876':
  lavfi: add trim and atrim filters.

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 11:34:34 +02:00
..
aac.mak
ac3.mak
acodec.mak
adpcm.mak
alac.mak
als.mak
amrnb.mak
amrwb.mak
atrac.mak
audio.mak
avformat.mak
bmp.mak
cdxl.mak
cover-art.mak
demux.mak
dfa.mak
dpcm.mak
ea.mak
ffmpeg.mak
ffprobe.mak
fft.mak
filter-audio.mak Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876' 2013-05-01 11:34:34 +02:00
filter-video.mak Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876' 2013-05-01 11:34:34 +02:00
flac.mak
gif.mak
h264.mak
image.mak
indeo.mak
libavcodec.mak
libavformat.mak
libavutil.mak
lossless-audio.mak
lossless-video.mak
microsoft.mak
mp3.mak
mpc.mak
pcm.mak
probe.mak
prores.mak
qt.mak
qtrle.mak
real.mak
screen.mak
seek.mak
subtitles.mak
utvideo.mak
vcodec.mak
video.mak
voice.mak
vorbis.mak
vpx.mak
vqf.mak
wavpack.mak
wma.mak