summaryrefslogtreecommitdiffstats
path: root/src/jogl/native/libav/lavc54.lavf54.lavu52.lavr01
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-08-28 02:44:29 +0200
committerSven Gothel <[email protected]>2013-08-28 02:44:29 +0200
commit15ec34db947f89b1d20043b729a09413a425de5d (patch)
treed5545d00009717cdabbb6e52963dbcdea7cc48b9 /src/jogl/native/libav/lavc54.lavf54.lavu52.lavr01
parent5031a42647442b71ef32041d332ed5f22d3e6ecf (diff)
Fix libav/ffmpeg compilation: Use 'dot less' dir/file names; Compile ffmpeg version dependent c-files individually and inject object files. ; ffmpeg *register_all() at setStream0(..)
- Use 'dot less' dir/file names - Compile ffmpeg version dependent c-files individually and inject object files. - ffmpeg *register_all() at setStream0(..) - Only register devices if available _and_ camera is requested.
Diffstat (limited to 'src/jogl/native/libav/lavc54.lavf54.lavu52.lavr01')
-rw-r--r--src/jogl/native/libav/lavc54.lavf54.lavu52.lavr01/jogamp_opengl_util_av_impl_FFMPEGv09Natives.c31
1 files changed, 0 insertions, 31 deletions
diff --git a/src/jogl/native/libav/lavc54.lavf54.lavu52.lavr01/jogamp_opengl_util_av_impl_FFMPEGv09Natives.c b/src/jogl/native/libav/lavc54.lavf54.lavu52.lavr01/jogamp_opengl_util_av_impl_FFMPEGv09Natives.c
deleted file mode 100644
index 53f72754f..000000000
--- a/src/jogl/native/libav/lavc54.lavf54.lavu52.lavr01/jogamp_opengl_util_av_impl_FFMPEGv09Natives.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifdef _WIN32
- #include <windows.h>
- // __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
-
- #define usleep(t) Sleep((t) / 1000)
-#endif
-
-#include <gluegen_stdint.h>
-#include <gluegen_inttypes.h>
-#include <gluegen_stddef.h>
-#include <gluegen_stdint.h>
-
-#include "libavcodec/avcodec.h"
-#include "libavformat/avformat.h"
-#include "libavutil/avutil.h"
-#if LIBAVCODEC_VERSION_MAJOR >= 54
-#include "libavresample/avresample.h"
-#endif
-
-#include "libavutil/pixdesc.h"
-#include "libavutil/samplefmt.h"
-#if LIBAVUTIL_VERSION_MAJOR < 53
- #include "libavutil/audioconvert.h"
- // 52: #include "libavutil/channel_layout.h"
-#endif
-
-#include "jogamp_opengl_util_av_impl_FFMPEGv09Natives.h"
-
-#define FF_FUNC(METHOD) Java_jogamp_opengl_util_av_impl_FFMPEGv09Natives_ ## METHOD
-
-#include "../jogamp_opengl_util_av_impl_FFMPEGvXXNatives.c"