diff options
| author | Sven Gothel <[email protected]> | 2013-08-25 09:12:19 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-08-25 09:12:19 +0200 |
| commit | 1b4edb60e8c91621d93033b8732b2cdef0e7ebe7 (patch) | |
| tree | 1f41cf8ef6d65253fa9cbc1ff1615c6be74538b5 /src/jogl/native/libav/ffmpeg_tool.h | |
| parent | 469314fff8dc53658db932bab6108107780619ee (diff) | |
libav/ffmpeg: Prepare for lavc54.lavf54.lavu52
- Add compile-time/runtime version check, fail if major versions do not match
assuming binary incompatibility
- Add: 'av_find_input_format' for future video input support
- Manually map '/dev/video<NUM>' to video input - not working yet.
- WINDOWS: Set file to '<NUM>'
- Set input format string depending on OS
Diffstat (limited to 'src/jogl/native/libav/ffmpeg_tool.h')
| -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 d1320ac5d..783746378 100644 --- a/src/jogl/native/libav/ffmpeg_tool.h +++ b/src/jogl/native/libav/ffmpeg_tool.h @@ -79,8 +79,8 @@ typedef void (APIENTRYP PFNGLFINISH) (void); /** Constant PTS marking the end of the stream, i.e. Integer.MIN_VALUE - 1 == 0x7FFFFFFF == {@value}. Sync w/ TimeFrameI.END_OF_STREAM_PTS */ #define END_OF_STREAM_PTS 0x7FFFFFFF -/** Until 55.0.0 */ -#define AV_HAS_API_REQUEST_CHANNELS(pAV) (AV_VERSION_MAJOR(pAV->avcodecVersion) < 55) +/** Until 55.0.0, but stopped working w/ 54 already :( */ +#define AV_HAS_API_REQUEST_CHANNELS(pAV) (AV_VERSION_MAJOR(pAV->avcodecVersion) < 54) /** Since 55.0.0 */ #define AV_HAS_API_REFCOUNTED_FRAMES(pAV) (AV_VERSION_MAJOR(pAV->avcodecVersion) >= 55) |