aboutsummaryrefslogtreecommitdiffstats
path: root/RELEASE
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-20 00:25:36 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-20 10:21:52 +0200
commit31f3c94760b42e16e998dcc0b34e677d1aa431bc (patch)
tree8a6033e5163bd038ea8ba5629233e7567e57d4ae /RELEASE
parentd1384c00d4882712816612d82289be240c508779 (diff)
parent63dcd16d567862d94fe4b178e47f440e8ad6a2c9 (diff)
downloadffmpeg-31f3c94760b42e16e998dcc0b34e677d1aa431bc.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: fate: fix dependencies on SAMPLES being set fate: remove unnecessary libavfilter dependency Conflicts: ffmpeg.c tests/Makefile tests/fate/aac.mak tests/fate/audio.mak tests/fate/demux.mak tests/fate/ea.mak tests/fate/image.mak tests/fate/lossless-audio.mak tests/fate/lossless-video.mak tests/fate/microsoft.mak tests/fate/mpc.mak tests/fate/probe.mak tests/fate/qt.mak tests/fate/real.mak tests/fate/screen.mak tests/fate/video.mak tests/fate/voice.mak tests/fate/vqf.mak tests/ref/fate/idroq-video-encode tests/ref/fate/vc1-ism Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'RELEASE')
0 files changed, 0 insertions, 0 deletions