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/native | |
| 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/native')
| -rw-r--r-- | src/jogl/native/libav/ffmpeg_tool.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jogl/native/libav/ffmpeg_tool.h b/src/jogl/native/libav/ffmpeg_tool.h index 61d121f24..97e60afce 100644 --- a/src/jogl/native/libav/ffmpeg_tool.h +++ b/src/jogl/native/libav/ffmpeg_tool.h @@ -96,10 +96,10 @@ typedef void (APIENTRYP PFNGLFINISH) (void); #define END_OF_STREAM_PTS 0x7FFFFFFF /** Since 54.0.0.1 */ -#define AV_HAS_API_AVRESAMPLE(pAV) ( pAV->avresampleVersion != 0 ) +#define AV_HAS_API_AVRESAMPLE(pAV) ( ( LIBAVRESAMPLE_VERSION_MAJOR >= 0 ) && ( pAV->avresampleVersion != 0 ) ) /** Since 55.0.0.1 */ -#define AV_HAS_API_SWRESAMPLE(pAV) ( pAV->swresampleVersion != 0 ) +#define AV_HAS_API_SWRESAMPLE(pAV) ( ( LIBSWRESAMPLE_VERSION_MAJOR >= 0 ) && ( pAV->swresampleVersion != 0 ) ) #define MAX_INT(a,b) ( (a >= b) ? a : b ) #define MIN_INT(a,b) ( (a <= b) ? a : b ) |