diff options
| author | Sven Gothel <[email protected]> | 2015-02-05 16:27:56 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-02-05 16:27:56 +0100 |
| commit | 1eea4278f1be5900f0d990d0a7d352923def217c (patch) | |
| tree | 208f53396ecf31c3e6f45fcda837e67a8d306167 /make/scripts | |
| parent | 8426f47419bf116b427461a36534e70c48ed930d (diff) | |
FFMPEGMediaPlayer: Add support for libav-11 and ffmpeg 2.[4-x] (Latest release, used in Debian 8, etc)
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/tests-x64.sh | 5 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh index 30b0aaf8a..8102c011f 100755 --- a/make/scripts/tests-x64.sh +++ b/make/scripts/tests-x64.sh @@ -10,7 +10,10 @@ SDIR=`dirname $0` #export LD_LIBRARY_PATH=$HOME/libav-10.1/lib:$LD_LIBRARY_PATH #export LD_LIBRARY_PATH=$HOME/ffmpeg-2.2.2/lib:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH=$HOME/ffmpeg-2.2.3/lib:$LD_LIBRARY_PATH +#export LD_LIBRARY_PATH=$HOME/ffmpeg-2.2.3/lib:$LD_LIBRARY_PATH + +#export LD_LIBRARY_PATH=$HOME/libav-11.2/lib:$LD_LIBRARY_PATH +#export LD_LIBRARY_PATH=$HOME/ffmpeg-2.5/lib:$LD_LIBRARY_PATH #J2RE_HOME=/opt-linux-x86_64/jre1.7.0_45 #JAVA_HOME=/opt-linux-x86_64/jdk1.7.0_45 diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index c6e3b4e20..83d51f971 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -299,7 +299,9 @@ function jrun() { #X_ARGS="-Xcheck:jni -verbose:jni" #X_ARGS="-Xrs" #X_ARGS="-Dsun.awt.disableMixing=true" - D_ARGS="-Djogamp.debug.IOUtil -Djogl.debug.GLSLCode -Djogl.debug.GLMediaPlayer" + #D_ARGS="-Djogamp.debug.NativeLibrary=true -Djogamp.debug.JNILibLoader=true -Djogl.debug.GLMediaPlayer" + D_ARGS="-Djogl.debug.GLMediaPlayer" + #D_ARGS="-Djogamp.debug.IOUtil -Djogl.debug.GLSLCode -Djogl.debug.GLMediaPlayer" #D_ARGS="-Djogl.debug.AudioSink -Djoal.openal.lib=system" #D_ARGS="-Djogl.debug.AudioSink -Djogl.debug.AudioSink.trace" #D_ARGS="-Djogl.debug.AudioSink -Djogl.debug.GLMediaPlayer" |