diff options
| author | Sven Gothel <[email protected]> | 2013-09-01 23:26:43 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-09-01 23:26:43 +0200 |
| commit | 87fe4c89d1b69773d62c1917594ddf7a724c6d71 (patch) | |
| tree | 9c448a0bee0f65ef72c91d0011f41f72ea2ce981 /src/jogl/classes/jogamp/opengl/util | |
| parent | dc604ed9b4085d406a8f95d235501e427458d24e (diff) | |
FFMPEGMediaPlayer: Handle use-case of having [av|sw]resample lib, but not compiled for it -> pass
Scenario ffmpeg-0.10, where we are not prepared (compiled-in) for sw-resample support.
Don't use if compiled in version (CC) is < 0 (n/a), and allow to pass at load time.
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/util')
| -rw-r--r-- | src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java | 4 |
1 files changed, 2 insertions, 2 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 c329e880f..33b1867c8 100644 --- a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java +++ b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java @@ -194,8 +194,8 @@ public class FFMPEGMediaPlayer extends GLMediaPlayerImpl { libAVVersionGood = avCodecMajorVersionCC == avCodecVersion.getMajor() && avFormatMajorVersionCC == avFormatVersion.getMajor() && avUtilMajorVersionCC == avUtilVersion.getMajor() && - ( !avResampleLoaded || avResampleMajorVersionCC == avResampleVersion.getMajor() ) && - ( !swResampleLoaded || swResampleMajorVersionCC == swResampleVersion.getMajor() ) ; + ( !avResampleLoaded || avResampleMajorVersionCC < 0 || avResampleMajorVersionCC == avResampleVersion.getMajor() ) && + ( !swResampleLoaded || swResampleMajorVersionCC < 0 || swResampleMajorVersionCC == swResampleVersion.getMajor() ) ; if( !libAVVersionGood ) { System.err.println("LIB_AV Not Matching Compile-Time / Runtime Major-Version"); } |