diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-06 23:38:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-06 23:43:02 +0200 |
| commit | 9e7f1474dd5f3d33794b46e9a6555031c5165023 (patch) | |
| tree | e2bb576a4701f7399fbf185ea638c63690ce8a14 /tests/ref/fate | |
| parent | 5297003aa7a06e0223f3842b810d9fb10f67789d (diff) | |
| parent | a027d2a8731f7c95dbb57be470160f0f94d6c97d (diff) | |
| download | ffmpeg-streaming-9e7f1474dd5f3d33794b46e9a6555031c5165023.zip ffmpeg-streaming-9e7f1474dd5f3d33794b46e9a6555031c5165023.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add tests for SANM and VIMA
Conflicts:
tests/fate/video.mak
tests/ref/fate/sanm
See: 4cdff582068b968f9c2f14ce4bd5a68be069ce11
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate')
| -rw-r--r-- | tests/ref/fate/adpcm-vima (renamed from tests/ref/fate/vima) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/ref/fate/vima b/tests/ref/fate/adpcm-vima index 6984c5d..6984c5d 100644 --- a/tests/ref/fate/vima +++ b/tests/ref/fate/adpcm-vima |
