diff options
| author | Sven Gothel <[email protected]> | 2014-05-09 09:23:06 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-05-09 09:23:06 +0200 |
| commit | 6c5f79e6c8144ed5b238b3612abefe9f64d9b18a (patch) | |
| tree | 953e0d9ec4ef56b1c50e767c6f99716636be83a5 /make/scripts | |
| parent | 00a163e328c772e83fc4d3d67c1ced9a51db4993 (diff) | |
FFMPEGMediaPlayer / FFMPEGv10Natives: Fix libav-10 and ffmpeg-2.x version validation (libavutil)
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/tests-x64.sh | 4 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh index 33939734e..93be80787 100755 --- a/make/scripts/tests-x64.sh +++ b/make/scripts/tests-x64.sh @@ -8,8 +8,8 @@ SDIR=`dirname $0` #export LD_LIBRARY_PATH=$HOME/libav-9.x/lib:$LD_LIBRARY_PATH #export LD_LIBRARY_PATH=$HOME/ffmpeg-1.2/lib:$LD_LIBRARY_PATH -#export LD_LIBRARY_PATH=$HOME/libav-10.x/lib:$LD_LIBRARY_PATH -#export LD_LIBRARY_PATH=$HOME/ffmpeg-2.x/lib:$LD_LIBRARY_PATH +#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 if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 87d57df73..d5d3b5a34 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -265,7 +265,7 @@ function jrun() { #D_ARGS="-Djogl.debug.AudioSink" #D_ARGS="-Djogl.debug.AudioSink.trace" #D_ARGS="-Djogl.debug.GLMediaPlayer -Djogl.debug.GLMediaPlayer.Native" - #D_ARGS="-Djogl.debug.GLMediaPlayer" + D_ARGS="-Djogl.debug.GLMediaPlayer" #D_ARGS="-Djogl.debug.GLMediaPlayer.StreamWorker.delay=25 -Djogl.debug.GLMediaPlayer" #D_ARGS="-Djogl.debug.GLMediaPlayer.Native" @@ -380,7 +380,7 @@ function testawtswt() { # av demos # #testnoawt jogamp.opengl.openal.av.ALDummyUsage $* -#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $* +testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.CrossFadePlayer $* @@ -750,7 +750,7 @@ function testawtswt() { #testnoawt com.jogamp.opengl.test.junit.graph.demos.ui.UINewtDemo01 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo $* -testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $* +#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $* |