jni: ijkplayer: cosmetic

ijkmediaplayer/jni/ijkplayer/Android.mk

-# copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
+#
+# Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
 #
 # This file is part of ijkPlayer.
 #

ijkmediaplayer/jni/ijkplayer/ff_cmdutils.c

-/*****************************************************************************
+/*
  * ff_cmdutils.c
- *****************************************************************************
+ *      based on ffmpeg/cmdutils.c
  *
- * copyright (c) 2001 Fabrice Bellard
- * copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
+ * Copyright (c) 2000-2003 Fabrice Bellard
+ * Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
  *
  * This file is part of ijkPlayer.
  *

ijkmediaplayer/jni/ijkplayer/ff_cmdutils.h

-/*****************************************************************************
+/*
  * ff_cmdutils.h
- *****************************************************************************
+ *      based on ffmpeg/cmdutils.h
  *
- * copyright (c) 2001 Fabrice Bellard
- * copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
+ * Copyright (c) 2000-2003 Fabrice Bellard
+ * Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
  *
  * This file is part of ijkPlayer.
  *

ijkmediaplayer/jni/ijkplayer/ff_ffinc.h

-/*****************************************************************************
+/*
  * ff_ffinc.h
  *      ffmpeg headers
- *****************************************************************************
  *
- * copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
+ * Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
  *
  * This file is part of ijkPlayer.
  *
@@ -25,6 +24,7 @@
 #ifndef IJKPLAYER__FF_FFINC_H
 #define IJKPLAYER__FF_FFINC_H
 
+#include <stdbool.h>
 #include "libavutil/avstring.h"
 #include "libavutil/colorspace.h"
 #include "libavformat/avformat.h"

ijkmediaplayer/jni/ijkplayer/ff_ffplay.h

-/*****************************************************************************
+/*
  * ff_ffplay.h
- *      forward declaration
- *      inline implement
- *****************************************************************************
  *
- * copyright (c) 2001 Fabrice Bellard
- * copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
+ * Copyright (c) 2003 Fabrice Bellard
+ * Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
  *
  * This file is part of ijkPlayer.
  *

ijkmediaplayer/jni/ijkplayer/ff_ffplay_config.h

-/*****************************************************************************
+/*
  * ff_ffplaye_def.h
- *****************************************************************************
  *
- * copyright (c) 2001 Fabrice Bellard
- * copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
+ * Copyright (c) 2003 Fabrice Bellard
+ * Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
  *
  * This file is part of ijkPlayer.
  *

ijkmediaplayer/jni/ijkplayer/ff_ffplay_def.h

-/*****************************************************************************
+/*
  * ff_ffplaye_def.h
- *      type define
- *      global variable declaration
- *****************************************************************************
  *
- * copyright (c) 2001 Fabrice Bellard
- * copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
+ * Copyright (c) 2003 Fabrice Bellard
+ * Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
  *
  * This file is part of ijkPlayer.
  *
@@ -224,9 +221,9 @@ typedef struct VideoState {
     int width, height, xleft, ytop;
     int step;
 
-#ifdef IJK_FFPLAY_MERGE_SUBTITLE
+#if CONFIG_AVFILTER
     AVFilterContext *in_video_filter;   // the first filter in the video chain
-    AVFilterContext *out_video_filter;// the last filter in the video chain
+    AVFilterContext *out_video_filter;  // the last filter in the video chain
     int use_dr1;
     FrameBuffer *buffer_pool;
 #endif
@@ -293,10 +290,9 @@ static int is_full_screen;
 static int64_t audio_callback_time;
 
 static AVPacket flush_pkt;
+#endif
 
-#else
 extern AVPacket flush_pkt;
-#endif
 
 #define FF_ALLOC_EVENT   (SDL_USEREVENT)
 #define FF_QUIT_EVENT    (SDL_USEREVENT + 2)

ijkmediaplayer/jni/ijkplayer/ijkerror.h

-/*****************************************************************************
+/*
  * ijkerror.h
- *****************************************************************************
  *
- * copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
+ * Copyright (c) 2003 Fabrice Bellard
+ * Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
  *
  * This file is part of ijkPlayer.
  *

ijkmediaplayer/jni/ijkplayer/ijkplayer.c

-/*****************************************************************************
+/*
  * ijkplayer.c
- *****************************************************************************
  *
- * copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
+ * Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
  *
  * This file is part of ijkPlayer.
  *

ijkmediaplayer/jni/ijkplayer/ijkplayer.h

-/*****************************************************************************
+/*
  * ijkplayer.h
- *****************************************************************************
  *
- * copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
+ * Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
  *
  * This file is part of ijkPlayer.
  *

ijkmediaplayer/jni/ijkplayer/ijkplayer_jni.c

-/*****************************************************************************
+/*
  * ijkplayer_jni.c
- *****************************************************************************
  *
- * copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
+ * Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
  *
  * This file is part of ijkPlayer.
  *