diff options
author | Sven Gothel <[email protected]> | 2013-12-18 22:02:35 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2013-12-18 22:02:35 +0100 |
commit | 476f22fb4b0b1d03c3f68d48734d4d39f5b8cc4f (patch) | |
tree | 1c1fe6ee122aebfb0a230af9769354971d0fb205 /src/jogl/classes/jogamp/opengl/util/av/impl | |
parent | 166e5da5298b16b0acbf900004964d370cd0aa29 (diff) | |
parent | 8a032a2c1f247819bdb08382fbebcc4cd896b3f2 (diff) |
Merge remote-tracking branch 'xranby/master'
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/util/av/impl')
-rw-r--r-- | src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java | 2 |
1 files changed, 2 insertions, 0 deletions
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 034b9457e..20e80c9f2 100644 --- a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java +++ b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java @@ -185,6 +185,7 @@ public class FFMPEGMediaPlayer extends GLMediaPlayerImpl { final boolean avResampleLoaded = FFMPEGDynamicLibraryBundleInfo.avResampleLoaded(); final VersionNumber swResampleVersion = FFMPEGDynamicLibraryBundleInfo.swResampleVersion; final boolean swResampleLoaded = FFMPEGDynamicLibraryBundleInfo.swResampleLoaded(); + if( DEBUG ) { System.err.println("LIB_AV Codec : "+avCodecVersion+" [cc "+avCodecMajorVersionCC+"]"); System.err.println("LIB_AV Format : "+avFormatVersion+" [cc "+avFormatMajorVersionCC+"]"); System.err.println("LIB_AV Util : "+avUtilVersion+" [cc "+avUtilMajorVersionCC+"]"); @@ -192,6 +193,7 @@ public class FFMPEGMediaPlayer extends GLMediaPlayerImpl { System.err.println("LIB_SW Resample: "+swResampleVersion+" [cc "+swResampleMajorVersionCC+", loaded "+swResampleLoaded+"]"); 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() && |