[Android] Revert "jni: fix compilation errors"

[Edward Wang]

vlc-ports/android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Mon Jun 17 09:06:59 2013 -0400| [ea1869f76ed2278bc26991ab0c81ef377232afa6] | committer: Edward Wang

Revert "jni: fix compilation errors"

No answer to LGPL licence change

This reverts commit 60655d70f4ac67e4d70968dd7fd3558e76ca6fe9.

Conflicts:

	vlc-android/jni/Android.mk
	vlc-android/jni/aout.c
	vlc-android/jni/libvlcjni.c
	vlc-android/jni/thumbnailer.c

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

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

diff --git a/vlc-android/jni/aout.c b/vlc-android/jni/aout.c
index a823bf6..6d31b14 100644
--- a/vlc-android/jni/aout.c
+++ b/vlc-android/jni/aout.c
@@ -51,7 +51,7 @@ int aout_open(void **opaque, char *format, unsigned *rate, unsigned *nb_channels
 
     aout_sys_t *p_sys = calloc (1, sizeof (*p_sys));
     if (!p_sys)
-        return -1;
+        return; // OOM
 
     p_sys->j_libVlc = *opaque;       // Keep a reference to our Java object
     *opaque         = (void*) p_sys; // The callback will need aout_sys_t
@@ -63,7 +63,7 @@ int aout_open(void **opaque, char *format, unsigned *rate, unsigned *nb_channels
     if ((*myVm)->AttachCurrentThread (myVm, &p_env, NULL) != 0)
     {
         LOGE("Could not attach the display thread to the JVM !");
-        return -1;
+        return;
     }
 
     // Call the init function.
diff --git a/vlc-android/jni/thumbnailer.c b/vlc-android/jni/thumbnailer.c
index 698df29..73c6bd5 100644
--- a/vlc-android/jni/thumbnailer.c
+++ b/vlc-android/jni/thumbnailer.c
@@ -146,7 +146,7 @@ jbyteArray Java_org_videolan_libvlc_LibVLC_getThumbnail(JNIEnv *env, jobject thi
     if (sys == NULL)
     {
         LOGE("Could not create the thumbnailer data structure!");
-        return NULL;
+        return;
     }
 
     /* Initialize the barrier. */