ff_ffplay: delete old version info

Signed-off-by: NXinzheng Zhang <zhangxzheng@gmail.com>

ijkmedia/ijkplayer/ff_ffplay.c

@@ -66,7 +66,6 @@
 #include "ff_ffpipeline.h"
 #include "ff_ffpipenode.h"
 #include "ff_ffplay_debug.h"
-#include "version.h"
 #include "ijkmeta.h"
 #include "ijkversion.h"
 #include <stdatomic.h>
@@ -105,6 +104,10 @@ static AVPacket flush_pkt;
 // FFP_MERGE: opt_add_vfilter
 #endif
 
+#define IJKVERSION_GET_MAJOR(x)     ((x >> 16) & 0xFF)
+#define IJKVERSION_GET_MINOR(x)     ((x >>  8) & 0xFF)
+#define IJKVERSION_GET_MICRO(x)     ((x      ) & 0xFF)
+
 #if CONFIG_AVFILTER
 static inline
 int cmp_audio_fmts(enum AVSampleFormat fmt1, int64_t channel_count1,
@@ -3234,7 +3237,7 @@ const AVClass ffp_context_class = {
     .child_class_next = ffp_context_child_class_next,
 };
 
-const char *ijk_version_info()
+static const char *ijk_version_info()
 {
     return IJKPLAYER_VERSION;
 }

ijkmedia/ijkplayer/ijkplayer.c

@@ -22,7 +22,7 @@
 
 #include "ijkplayer.h"
 #include "ijkplayer_internal.h"
-#include "version.h"
+#include "ijkversion.h"
 
 #define MP_RET_IF_FAILED(ret) \
     do { \
@@ -90,14 +90,9 @@ void ijkmp_global_set_inject_callback(ijk_inject_callback cb)
     ffp_global_set_inject_callback(cb);
 }
 
-const char *ijkmp_version_ident()
+const char *ijkmp_version()
 {
-    return LIBIJKPLAYER_IDENT;
-}
-
-unsigned int ijkmp_version_int()
-{
-    return LIBIJKPLAYER_VERSION_INT;
+    return IJKPLAYER_VERSION;
 }
 
 void ijkmp_io_stat_register(void (*cb)(const char *url, int type, int bytes))

ijkmedia/ijkplayer/ijkplayer.h

@@ -155,8 +155,7 @@ void            ijkmp_global_uninit();
 void            ijkmp_global_set_log_report(int use_report);
 void            ijkmp_global_set_log_level(int log_level);   // log_level = AV_LOG_xxx
 void            ijkmp_global_set_inject_callback(ijk_inject_callback cb);
-const char     *ijkmp_version_ident();
-unsigned int    ijkmp_version_int();
+const char     *ijkmp_version();
 void            ijkmp_io_stat_register(void (*cb)(const char *url, int type, int bytes));
 void            ijkmp_io_stat_complete_register(void (*cb)(const char *url,
                                                            int64_t read_bytes, int64_t total_size,

ijkmedia/ijkplayer/version.h

-/*
- * Copyright (c) 2015 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 FFPLAY__VERSION_H
-#define FFPLAY__VERSION_H
-
-#include "libavutil/version.h"
-
-/*
- * The major version number is incremented with backward incompatible changes
- *   - e.g. removing parts of the public API, reordering public struct members, etc. 
- * The minor version number is incremented for backward compatible API changes
- * or major new features
- *   - e.g. adding a new public function or a new decoder.
- * The micro version number is incremented for smaller changes that a calling program
- * might still want to check for
- *   - e.g. changing behavior in a previously unspecified situation.
- */
-
-#define LIBIJKPLAYER_VERSION_MAJOR  2
-#define LIBIJKPLAYER_VERSION_MINOR  0
-#define LIBIJKPLAYER_VERSION_MICRO  0
-
-#define LIBIJKPLAYER_VERSION_INT    AV_VERSION_INT(LIBIJKPLAYER_VERSION_MAJOR, \
-                                                   LIBIJKPLAYER_VERSION_MINOR, \
-                                                   LIBIJKPLAYER_VERSION_MICRO)
-#define LIBIJKPLAYER_VERSION        AV_VERSION(LIBIJKPLAYER_VERSION_MAJOR,     \
-                                               LIBIJKPLAYER_VERSION_MINOR,     \
-                                               LIBIJKPLAYER_VERSION_MICRO)
-#define LIBIJKPLAYER_BUILD          LIBIJKPLAYER_VERSION_INT
-
-#define LIBIJKPLAYER_IDENT          "ijkplayer " AV_STRINGIFY(LIBIJKPLAYER_VERSION)
-
-#define IJKVERSION_GET_MAJOR(x)     ((x >> 16) & 0xFF)
-#define IJKVERSION_GET_MINOR(x)     ((x >>  8) & 0xFF)
-#define IJKVERSION_GET_MICRO(x)     ((x      ) & 0xFF)
-
-#endif//FFPLAY__VERSION_H