From b5876b598ecf3eb32ceb183ecbd5d29b8885a304 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 26 Aug 2013 13:38:40 +0200 Subject: libav/ffmpeg: Compile/Link 2 versions of native FFMPEGMediaPlayer methods FFMPEGNatives -> FFMPEGv08Natives + FFMPEGv09Natives Enables FFMPEGMediaPlayer to work w/ either ffmpeg/libav version 8 or 9 w/ same JOGL binary Same C source code is compiled against 1: version 0.8 FFMPEGv08Natives lavc53.lavf53.lavu51 2: version 0.9 FFMPEGv09Natives lavc54.lavf54.lavu52.lavr01 FFMPEGv08Natives and FFMPEGv09Natives implements FFMPEGNatives, native C code uses CPP '##' macro concatenation to produce unique function names. To enable 'cpp' to find the libav* header files matching the desired version, we have placed them in the c-file's folder, issued '#include "path/file.h" and added symbolic links to allow finding same module and 'sister modules': ls -l libavformat/ .. lrwxrwxrwx 1 sven sven 13 Aug 26 12:56 libavcodec -> ../libavcodec lrwxrwxrwx 1 sven sven 14 Aug 26 12:56 libavformat -> ../libavformat lrwxrwxrwx 1 sven sven 12 Aug 26 12:57 libavutil -> ../libavutil .. At static init FFMPEGDynamicLibraryBundleInfo, determines the runtime version and instantiates the matching FFMPEGNatives, or null if non matches. FFMPEGMediaPlayer still compares the compile-time and runtime versions. FFMPEGMediaPlayer passes it's own instance to FFMPEGNatives for callbacks. --- .../libav/lavc54.lavf54.lavu52.lavr01/libavutil/audioconvert.h | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/audioconvert.h (limited to 'make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/audioconvert.h') diff --git a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/audioconvert.h b/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/audioconvert.h deleted file mode 100644 index 300a67cd3..000000000 --- a/make/stub_includes/libav/lavc54.lavf54.lavu52.lavr01/libavutil/audioconvert.h +++ /dev/null @@ -1,6 +0,0 @@ - -#include "version.h" - -#if FF_API_AUDIOCONVERT -#include "channel_layout.h" -#endif -- cgit v1.2.3