From 77196201f7e9ae3ceed493fb025264c90ed9a554 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 13 Sep 2013 19:44:38 +0200 Subject: Complete commit 4b866d2686ab9c3fd7cf6708925b4663ad81e359: Relocate FFMPEGNatives.initIDS0() -> FFMPEGStaticNatives.initIDS0(); Cleanup up warnings and includes (clang); Forgot to commit new ffmpeg_static.h --- src/jogl/native/libav/ffmpeg_static.h | 50 +++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 src/jogl/native/libav/ffmpeg_static.h (limited to 'src/jogl/native/libav') diff --git a/src/jogl/native/libav/ffmpeg_static.h b/src/jogl/native/libav/ffmpeg_static.h new file mode 100644 index 000000000..ab4db2506 --- /dev/null +++ b/src/jogl/native/libav/ffmpeg_static.h @@ -0,0 +1,50 @@ +/** + * Copyright 2013 JogAmp Community. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of JogAmp Community. + */ + +#ifndef _FFMPEG_STATIC_H +#define _FFMPEG_STATIC_H + +#ifdef _WIN32 + #include +#endif + +#include +#include +#include +#include + +#include "jogamp_opengl_util_av_impl_FFMPEGStaticNatives.h" + +extern jmethodID ffmpeg_jni_mid_pushSound; +extern jmethodID ffmpeg_jni_mid_updateAttributes; +extern jmethodID ffmpeg_jni_mid_setIsGLOriented; +extern jmethodID ffmpeg_jni_mid_setupFFAttributes; +extern jmethodID ffmpeg_jni_mid_isAudioFormatSupported; + +#endif /* _FFMPEG_STATIC_H */ + -- cgit v1.2.3