From b222d19e5f45fc3683b58dd788262597a1e14635 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 10 Apr 2014 06:52:16 +0200 Subject: Reduce jar-size / cleanup: Replace 1 kB test-ntsc01-57x32.png w/ 400kB test-ntsc01-28x16.png asset ; Generalize TextureSequenceDemo01 -> SingleTextureSeqFrame ; Unit tests use test-data, not assets. --- .../assets/jogl/util/data/av/test-ntsc01-28x16.png | Bin 0 -> 396 bytes .../assets/jogl/util/data/av/test-ntsc01-57x32.png | Bin 969 -> 0 bytes make/resources/misc/test-ntsc01-57x32.png | Bin 0 -> 969 bytes make/scripts/tests-x64.sh | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 make/resources/assets/jogl/util/data/av/test-ntsc01-28x16.png delete mode 100644 make/resources/assets/jogl/util/data/av/test-ntsc01-57x32.png create mode 100644 make/resources/misc/test-ntsc01-57x32.png (limited to 'make') diff --git a/make/resources/assets/jogl/util/data/av/test-ntsc01-28x16.png b/make/resources/assets/jogl/util/data/av/test-ntsc01-28x16.png new file mode 100644 index 000000000..4601a214e Binary files /dev/null and b/make/resources/assets/jogl/util/data/av/test-ntsc01-28x16.png differ diff --git a/make/resources/assets/jogl/util/data/av/test-ntsc01-57x32.png b/make/resources/assets/jogl/util/data/av/test-ntsc01-57x32.png deleted file mode 100644 index 0a1488c6b..000000000 Binary files a/make/resources/assets/jogl/util/data/av/test-ntsc01-57x32.png and /dev/null differ diff --git a/make/resources/misc/test-ntsc01-57x32.png b/make/resources/misc/test-ntsc01-57x32.png new file mode 100644 index 000000000..0a1488c6b Binary files /dev/null and b/make/resources/misc/test-ntsc01-57x32.png differ diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh index fe2fc4958..7e1dc46d8 100755 --- a/make/scripts/tests-x64.sh +++ b/make/scripts/tests-x64.sh @@ -6,7 +6,7 @@ SDIR=`dirname $0` #export LD_LIBRARY_PATH=/home/sven/ffmpeg-0.10/lib:$LD_LIBRARY_PATH #export LD_LIBRARY_PATH=/home/sven/libav-9.x/lib:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH=/home/sven/ffmpeg-1.2/lib:$LD_LIBRARY_PATH +#export LD_LIBRARY_PATH=/home/sven/ffmpeg-1.2/lib:$LD_LIBRARY_PATH #export LD_LIBRARY_PATH=/home/sven/libav-10.x/lib:$LD_LIBRARY_PATH #export LD_LIBRARY_PATH=/home/sven/ffmpeg-2.x/lib:$LD_LIBRARY_PATH -- cgit v1.2.3