Michael Niedermayer
31f3c94760
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>
2012-05-20 10:21:52 +02:00
..
2012-05-20 10:21:52 +02:00
2012-05-19 14:30:41 +01:00
2012-05-19 14:30:41 +01:00
2012-05-19 14:30:41 +01:00
2012-05-19 14:30:41 +01:00
2012-05-19 14:30:41 +01:00
2012-05-19 14:30:41 +01:00
2012-05-20 10:21:52 +02:00
2012-05-19 14:30:41 +01:00
2012-05-19 14:30:41 +01:00
2012-05-09 14:13:34 +01:00
2012-05-20 10:21:52 +02:00
2012-05-19 14:30:41 +01:00
2012-05-19 14:30:41 +01:00
2012-05-20 10:21:52 +02:00
2012-05-09 14:13:34 +01:00
2012-05-20 10:21:52 +02:00
2012-05-20 10:21:52 +02:00
2012-05-19 14:30:41 +01:00
2012-05-09 14:13:34 +01:00
2012-05-09 14:13:34 +01:00
2012-05-20 10:21:52 +02:00
2012-05-20 10:21:52 +02:00
2012-05-10 02:25:41 +02:00
2012-05-20 10:21:52 +02:00
2012-05-19 14:30:41 +01:00
2012-05-20 10:21:52 +02:00
2012-05-19 14:30:41 +01:00
2012-05-20 10:21:52 +02:00
2012-05-20 10:21:52 +02:00
2012-05-20 10:21:52 +02:00
2012-05-19 14:30:41 +01:00
2012-05-20 10:21:52 +02:00
2012-05-20 10:21:52 +02:00
2012-05-19 14:30:41 +01:00
2012-05-20 10:21:52 +02:00
2012-05-20 10:21:52 +02:00
2012-05-19 14:30:41 +01:00
2012-05-20 10:21:52 +02:00
2012-05-20 10:21:52 +02:00
2012-05-19 14:30:41 +01:00
2012-05-19 14:30:41 +01:00