diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-04 06:06:26 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-04 06:06:26 +0400 |
| commit | 707e8612e85ba83fcbbfc56be3f4ab24af7e98fb (patch) | |
| tree | 63a0dec27eaca16ab40ea8d6a888bbf97662151e /Makefile | |
| parent | b5f20892c960ab9058c74703b29d7bf9d248bd36 (diff) | |
| parent | 8ce67bcabe7f50622430c11c3384675f095c78b5 (diff) | |
Merge remote branch 'qatar/master'
* qatar/master:
Implement fate-rsync target
Make ffmpeg support generic data stream
Conflicts:
cmdutils.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -280,7 +280,11 @@ fate-seek: $(FATE_SEEK) ifdef SAMPLES FATE += $(FATE_TESTS) +fate-rsync: + rsync -vaLW rsync://fate-suite.libav.org/fate-suite/ $(SAMPLES) else +fate-rsync: + @echo "use 'make fate-rsync SAMPLES=/path/to/samples' to sync the fate suite" $(FATE_TESTS): @echo "SAMPLES not specified, cannot run FATE" endif |