[Android] libvlcjni: move aout constants

Sébastien Toque git at videolan.org
Sun Jul 28 12:04:36 CEST 2013


vlc-ports/android | branch: master | Sébastien Toque <xilasz at gmail.com> | Sun Jul 28 10:39:54 2013 +0200| [013983163e6ed72497d58020236ab50d229a3a13] | committer: Sébastien Toque

libvlcjni: move aout constants

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=013983163e6ed72497d58020236ab50d229a3a13
---

 vlc-android/jni/aout.h      |    4 ++++
 vlc-android/jni/libvlcjni.c |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vlc-android/jni/aout.h b/vlc-android/jni/aout.h
index c6f11b5..3c0f385 100644
--- a/vlc-android/jni/aout.h
+++ b/vlc-android/jni/aout.h
@@ -23,6 +23,10 @@
 
 #include <stdint.h>
 
+#define AOUT_AUDIOTRACK_JAVA 0
+#define AOUT_AUDIOTRACK      1
+#define AOUT_OPENSLES        2
+
 int aout_open(void **opaque, char *format, unsigned *rate, unsigned *nb_channels);
 void aout_play(void *opaque, const void *samples, unsigned count, int64_t pts);
 void aout_pause(void *opaque, int64_t pts);
diff --git a/vlc-android/jni/libvlcjni.c b/vlc-android/jni/libvlcjni.c
index 9631e43..a98f9d0 100644
--- a/vlc-android/jni/libvlcjni.c
+++ b/vlc-android/jni/libvlcjni.c
@@ -42,10 +42,6 @@
 #define LOG_TAG "VLC/JNI/main"
 #include "log.h"
 
-#define AOUT_AUDIOTRACK_JAVA 0
-#define AOUT_AUDIOTRACK      1
-#define AOUT_OPENSLES        2
-
 static jint getInt(JNIEnv *env, jobject thiz, const char* field) {
     jclass clazz = (*env)->GetObjectClass(env, thiz);
     jfieldID fieldMP = (*env)->GetFieldID(env, clazz,



More information about the Android mailing list