FFMPEGMediaPlayer / FFMPEGv10Natives: Fix libav-10 and ffmpeg-2.x version validation (libavutil)

69 files changed, 25 insertions, 17 deletions

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 4cdb93f4d..2e314a9bd 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1510,7 +1510,7 @@
         <patternset id="c.obj.files.ffmpeg.inject">
           <include name="${rootrel.obj.joglsub}/ffmpeg_lavc53_lavf53_lavu51.*"/>
           <include name="${rootrel.obj.joglsub}/ffmpeg_lavc54_lavf54_lavu52_lavr01.*"/>
-          <include name="${rootrel.obj.joglsub}/ffmpeg_lavc55_lavf55_lavu52_lavr01.*"/>
+          <include name="${rootrel.obj.joglsub}/ffmpeg_lavc55_lavf55_lavu53_lavr01.*"/>
         </patternset>
 
         <patternset id="c.src.files.jogl.desktop">
@@ -1665,7 +1665,7 @@
                compiler.cfg.id="${compiler.cfg.id}"
                linker.cfg.id="${linker.cfg.id.os}"/>
 
-      <c.build.ffmpeg version.lav="lavc55_lavf55_lavu52_lavr01"
+      <c.build.ffmpeg version.lav="lavc55_lavf55_lavu53_lavr01"
                output.lib.name="jogl_ffmpegv10"
                compiler.cfg.id="${compiler.cfg.id}"
                linker.cfg.id="${linker.cfg.id.os}"/>
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 $*
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavcodec/avcodec.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavcodec/avcodec.h
index 244f47ba1..244f47ba1 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavcodec/avcodec.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavcodec/avcodec.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavcodec/avfft.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavcodec/avfft.h
index e2e727da9..e2e727da9 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavcodec/avfft.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavcodec/avfft.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavcodec/dxva2.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavcodec/dxva2.h
index d161eb9f5..d161eb9f5 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavcodec/dxva2.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavcodec/dxva2.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavcodec/vaapi.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavcodec/vaapi.h
index 39e88259d..39e88259d 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavcodec/vaapi.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavcodec/vaapi.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavcodec/vda.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavcodec/vda.h
index 987b94f1f..987b94f1f 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavcodec/vda.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavcodec/vda.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavcodec/vdpau.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavcodec/vdpau.h
index 75cb1bf7a..75cb1bf7a 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavcodec/vdpau.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavcodec/vdpau.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavcodec/version.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavcodec/version.h
index cdd5a613d..cdd5a613d 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavcodec/version.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavcodec/version.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavcodec/xvmc.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavcodec/xvmc.h
index 950ed1827..950ed1827 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavcodec/xvmc.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavcodec/xvmc.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavformat/avformat.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavformat/avformat.h
index ec9c2627c..ec9c2627c 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavformat/avformat.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavformat/avformat.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavformat/avio.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavformat/avio.h
index 3360e8296..3360e8296 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavformat/avio.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavformat/avio.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavformat/version.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavformat/version.h
index 3d1e21f17..3d1e21f17 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavformat/version.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavformat/version.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavresample/avresample.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavresample/avresample.h
index d26f2ca22..d26f2ca22 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavresample/avresample.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavresample/avresample.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavresample/version.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavresample/version.h
index fce5770c6..fce5770c6 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavresample/version.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavresample/version.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/adler32.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/adler32.h
index a8ff6f9d4..a8ff6f9d4 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/adler32.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/adler32.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/aes.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/aes.h
index edff275b7..edff275b7 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/aes.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/aes.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/attributes.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/attributes.h
index d7f2bb5c6..d7f2bb5c6 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/attributes.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/attributes.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/audio_fifo.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/audio_fifo.h
index 8c7638825..8c7638825 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/audio_fifo.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/audio_fifo.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/audioconvert.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/audioconvert.h
index 300a67cd3..300a67cd3 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/audioconvert.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/audioconvert.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/avassert.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/avassert.h
index b223d26e8..b223d26e8 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/avassert.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/avassert.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/avconfig.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/avconfig.h
index f10aa6186..f10aa6186 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/avconfig.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/avconfig.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/avstring.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/avstring.h
index b7d10983c..b7d10983c 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/avstring.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/avstring.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/avutil.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/avutil.h
index a0d35d162..a0d35d162 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/avutil.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/avutil.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/base64.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/base64.h
index 4750cf5c7..4750cf5c7 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/base64.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/base64.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/blowfish.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/blowfish.h
index 8c29536cf..8c29536cf 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/blowfish.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/blowfish.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/bswap.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/bswap.h
index 93a6016b8..93a6016b8 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/bswap.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/bswap.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/buffer.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/buffer.h
index 56b4d020e..56b4d020e 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/buffer.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/buffer.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/channel_layout.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/channel_layout.h
index 6a1f83005..6a1f83005 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/channel_layout.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/channel_layout.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/common.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/common.h
index eb40e1299..eb40e1299 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/common.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/common.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/cpu.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/cpu.h
index 29036e394..29036e394 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/cpu.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/cpu.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/crc.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/crc.h
index 0540619d2..0540619d2 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/crc.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/crc.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/dict.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/dict.h
index e0a91ae83..e0a91ae83 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/dict.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/dict.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/downmix_info.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/downmix_info.h
index 69969f6fb..69969f6fb 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/downmix_info.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/downmix_info.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/error.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/error.h
index 268a0320a..268a0320a 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/error.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/error.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/eval.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/eval.h
index ccb29e7a3..ccb29e7a3 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/eval.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/eval.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/fifo.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/fifo.h
index ea30f5d2b..ea30f5d2b 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/fifo.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/fifo.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/file.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/file.h
index e3f02a830..e3f02a830 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/file.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/file.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/frame.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/frame.h
index 63ed219f4..63ed219f4 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/frame.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/frame.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/hmac.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/hmac.h
index 28c2062b1..28c2062b1 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/hmac.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/hmac.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/imgutils.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/imgutils.h
index 71510132a..71510132a 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/imgutils.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/imgutils.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/intfloat.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/intfloat.h
index 38d26ad87..38d26ad87 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/intfloat.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/intfloat.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/intreadwrite.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/intreadwrite.h
index f77fd60f3..f77fd60f3 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/intreadwrite.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/intreadwrite.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/lfg.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/lfg.h
index 5e526c1da..5e526c1da 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/lfg.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/lfg.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/log.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/log.h
index 6d26b67db..6d26b67db 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/log.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/log.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/lzo.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/lzo.h
index 9d7e8f1dc..9d7e8f1dc 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/lzo.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/lzo.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/macros.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/macros.h
index bf3eb9b9a..bf3eb9b9a 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/macros.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/macros.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/mathematics.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/mathematics.h
index 043dd0faf..043dd0faf 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/mathematics.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/mathematics.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/md5.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/md5.h
index 29e4e7c2b..29e4e7c2b 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/md5.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/md5.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/mem.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/mem.h
index 4a5e362ce..4a5e362ce 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/mem.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/mem.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/old_pix_fmts.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/old_pix_fmts.h
index d3e1e5b24..d3e1e5b24 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/old_pix_fmts.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/old_pix_fmts.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/opt.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/opt.h
index 0181379b7..0181379b7 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/opt.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/opt.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/parseutils.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/parseutils.h
index 0844abb2f..0844abb2f 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/parseutils.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/parseutils.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/pixdesc.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/pixdesc.h
index e5a16f418..e5a16f418 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/pixdesc.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/pixdesc.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/pixfmt.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/pixfmt.h
index 0d6e0a300..0d6e0a300 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/pixfmt.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/pixfmt.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/random_seed.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/random_seed.h
index b1fad13d0..b1fad13d0 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/random_seed.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/random_seed.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/rational.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/rational.h
index 5d7dab7fd..5d7dab7fd 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/rational.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/rational.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/samplefmt.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/samplefmt.h
index 33cbdedf5..33cbdedf5 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/samplefmt.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/samplefmt.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/sha.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/sha.h
index 4c9a0c909..4c9a0c909 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/sha.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/sha.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/stereo3d.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/stereo3d.h
index 695d6f1ba..695d6f1ba 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/stereo3d.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/stereo3d.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/time.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/time.h
index b01a97d77..b01a97d77 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/time.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/time.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/version.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/version.h
index 5196a674d..5196a674d 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/version.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/version.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/xtea.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/xtea.h
index 7d2b07bbc..7d2b07bbc 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libavutil/xtea.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libavutil/xtea.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libswresample/swresample.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libswresample/swresample.h
index 4ba008e72..4ba008e72 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libswresample/swresample.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libswresample/swresample.h
diff --git a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libswresample/version.h b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libswresample/version.h
index 3a9287519..3a9287519 100644
--- a/make/stub_includes/libav/lavc55_lavf55_lavu52_lavr01/libswresample/version.h
+++ b/make/stub_includes/libav/lavc55_lavf55_lavu53_lavr01/libswresample/version.h
diff --git a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGDynamicLibraryBundleInfo.java
index a6a6fba97..e7a425a54 100644
--- a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGDynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGDynamicLibraryBundleInfo.java
@@ -214,14 +214,17 @@ class FFMPEGDynamicLibraryBundleInfo implements DynamicLibraryBundleInfo  {
             natives = null;
             ready = false;
         } else {
-            if( avCodecVersion.getMajor() == 53 && avFormatVersion.getMajor() == 53 && avUtilVersion.getMajor() == 51 ) {
+            final int avCodecMajor = avCodecVersion.getMajor();
+            final int avFormatMajor = avFormatVersion.getMajor();
+            final int avUtilMajor = avUtilVersion.getMajor();
+            if(        avCodecMajor == 53 && avFormatMajor == 53 && avUtilMajor == 51 ) {
                 // lavc53.lavf53.lavu51
                 natives = new FFMPEGv08Natives();
-            } else if( avCodecVersion.getMajor() == 54 && avFormatVersion.getMajor() == 54 && avUtilVersion.getMajor() == 52 ) {
+            } else if( avCodecMajor == 54 && avFormatMajor == 54 && avUtilMajor == 52 ) {
                 // lavc54.lavf54.lavu52.lavr01
                 natives = new FFMPEGv09Natives();
-            } else if( avCodecVersion.getMajor() == 55 && avFormatVersion.getMajor() == 55 && avUtilVersion.getMajor() == 52 ) {
-                // lavc55.lavf55.lavu52.lavr01
+            } else if( avCodecMajor == 55 && avFormatMajor == 55 && ( avUtilMajor == 52 || avUtilMajor == 53 ) ) {
+                // lavc55.lavf55.lavu52.lavr01 (ffmpeg) or lavc55.lavf55.lavu53.lavr01 (libav)
                 natives = new FFMPEGv10Natives();
             } else {
                 System.err.println("LIB_AV No Version/Native-Impl Match");
diff --git a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java
index 6121172c8..bbdc6f206 100644
--- a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java
+++ b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java
@@ -107,9 +107,9 @@ import jogamp.opengl.util.av.impl.FFMPEGNatives.SampleFormat;
  * Currently we are binary compatible w/:
  * <table border="1">
  * <tr><th>libav / ffmpeg</th><th>lavc</th><th>lavf</th><th>lavu</th><th>lavr</th>    <th>FFMPEG* class</th></tr>
- * <tr><td>0.8</td>           <td>53</td>  <td>53</td>  <td>51</td>  <td></td>        <td>FFMPEGv08</td></tr>
- * <tr><td>9.0 / 1.2</td>     <td>54</td>  <td>54</td>  <td>52</td>  <td>01/00</td>   <td>FFMPEGv09</td></tr>
- * <tr><td>10 / 2</td>        <td>55</td>  <td>55</td>  <td>52</td>  <td>01/00</td>   <td>FFMPEGv10</td></tr>
+ * <tr><td>0.8</td>           <td>53</td>  <td>53</td>  <td>51</td>     <td></td>        <td>FFMPEGv08</td></tr>
+ * <tr><td>9.0 / 1.2</td>     <td>54</td>  <td>54</td>  <td>52</td>     <td>01/00</td>   <td>FFMPEGv09</td></tr>
+ * <tr><td>10 / 2</td>        <td>55</td>  <td>55</td>  <td>53/52</td>  <td>01/00</td>   <td>FFMPEGv10</td></tr>
  * </table>
  * </p>
  * <p>
@@ -194,9 +194,14 @@ public class FFMPEGMediaPlayer extends GLMediaPlayerImpl {
                 System.err.println("LIB_AV Device  : [loaded "+FFMPEGDynamicLibraryBundleInfo.avDeviceLoaded()+"]");
                 System.err.println("LIB_AV Class   : "+(null!= natives ? natives.getClass().getSimpleName() : "n/a"));
             }
-            libAVVersionGood = avCodecMajorVersionCC  == avCodecVersion.getMajor() &&
-                               avFormatMajorVersionCC == avFormatVersion.getMajor() &&
-                               avUtilMajorVersionCC   == avUtilVersion.getMajor() &&
+            final int avCodecMajor = avCodecVersion.getMajor();
+            final int avFormatMajor = avFormatVersion.getMajor();
+            final int avUtilMajor = avUtilVersion.getMajor();
+            libAVVersionGood = avCodecMajorVersionCC  == avCodecMajor &&
+                               avFormatMajorVersionCC == avFormatMajor &&
+                               ( avUtilMajorVersionCC == avUtilMajor ||
+                                 55 == avCodecMajorVersionCC && 53 == avUtilMajorVersionCC && 52 == avUtilMajor /* ffmpeg 2.x */
+                               ) &&
                                ( !avResampleLoaded || avResampleMajorVersionCC < 0 || avResampleMajorVersionCC  == avResampleVersion.getMajor() ) &&
                                ( !swResampleLoaded || swResampleMajorVersionCC < 0 || swResampleMajorVersionCC  == swResampleVersion.getMajor() ) ;
             if( !libAVVersionGood ) {
diff --git a/src/jogl/native/libav/ffmpeg_lavc55_lavf55_lavu52_lavr01.c b/src/jogl/native/libav/ffmpeg_lavc55_lavf55_lavu53_lavr01.c
index 277100398..277100398 100644
--- a/src/jogl/native/libav/ffmpeg_lavc55_lavf55_lavu52_lavr01.c
+++ b/src/jogl/native/libav/ffmpeg_lavc55_lavf55_lavu53_lavr01.c