diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/resources/assets/jogl/util/data/av/test-ntsc01-28x16.png | bin | 0 -> 396 bytes | |||
| -rw-r--r-- | make/resources/misc/test-ntsc01-57x32.png (renamed from make/resources/assets/jogl/util/data/av/test-ntsc01-57x32.png) | bin | 969 -> 969 bytes | |||
| -rwxr-xr-x | make/scripts/tests-x64.sh | 2 |
3 files changed, 1 insertions, 1 deletions
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 Binary files differnew file mode 100644 index 000000000..4601a214e --- /dev/null +++ b/make/resources/assets/jogl/util/data/av/test-ntsc01-28x16.png diff --git a/make/resources/assets/jogl/util/data/av/test-ntsc01-57x32.png b/make/resources/misc/test-ntsc01-57x32.png Binary files differindex 0a1488c6b..0a1488c6b 100644 --- a/make/resources/assets/jogl/util/data/av/test-ntsc01-57x32.png +++ b/make/resources/misc/test-ntsc01-57x32.png 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 |
