cosmetic

ijkmediaplayer/jni/ijkplayer/ffplay_def.h

@@ -26,10 +26,12 @@
 #define IJKPLAYER__FFPLAY_DEF_H
 
 #include <inttypes.h>
+
 #include "libavformat/avformat.h"
 #include "libavcodec/avfft.h"
 #include "libswresample/swresample.h"
-#include "ijksdl/ijksdl.h"
+
+#include "ffplay_sdl.h"
 #include "ffplay_pkt_queue.h"
 #include "ffplay_cmdutils.h"
 

ijkmediaplayer/jni/ijkplayer/ffplay_read_thread.c

@@ -23,6 +23,7 @@
  */
 
 #include <string.h>
+#include "ffplay_sdl.h"
 #include "ffplayer.h"
 
 /* ffplay.c 1082 */

ijkmediaplayer/jni/ijkplayer/ffplay_sdl.h

+/*****************************************************************************
+ * ffplay_sdl.h
+ *****************************************************************************
+ *
+ * copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
+ *
+ * This file is part of ijkPlayer.
+ *
+ * ijkPlayer is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * ijkPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with ijkPlayer; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef IJKPLAYER__FFPLAY_SDL_H
+#define IJKPLAYER__FFPLAY_SDL_H
+
+#include "ijksdl/ijksdl.h"
+
+#endif
+

ijkmediaplayer/jni/ijkplayer/ijkplayer_jni.c

@@ -79,7 +79,8 @@ static IjkMediaPlayer *set_media_player(JNIEnv* env, jobject thiz, IjkMediaPlaye
 static void
 IjkMediaPlayer_setDataSourceAndHeaders(
         JNIEnv *env, jobject thiz, jstring path,
-        jobjectArray keys, jobjectArray values) {
+        jobjectArray keys, jobjectArray values)
+{
     const char *c_path = NULL;
     IjkMediaPlayer *mp = get_media_player(env, thiz);
     JNI_CHECK_GOTO(path, env, "java/lang/IllegalArgumentException", "mpjni: setDataSource: null path", LABEL_RETURN);

ijkmediaplayer/jni/ijksdl/ijksdl_thread.h

@@ -37,6 +37,6 @@ typedef struct SDL_Thread
 
 SDL_Thread *SDL_CreateThread(int (*fn)(void *), void *data);
 SDL_Thread *SDL_CreateThreadEx(SDL_Thread *thread, int (*fn)(void *), void *data);
-void SDL_WaitThread(SDL_Thread *thread, int *status);
+void        SDL_WaitThread(SDL_Thread *thread, int *status);
 
 #endif