From 0cb88628fbd467636fcf3ebfe6a26c51b0f49504 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 17 Mar 2011 16:57:37 +0100
Subject: [PATCH] Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of
FFMPEG_*"
This reverts commit a03be6e1ba4cbf9984b0bbdb674704bbb2da6713.
---
cmdutils.c | 4 ++--
configure | 2 +-
libavcodec/utils.c | 2 +-
libavdevice/avdevice.c | 2 +-
libavfilter/avfilter.c | 2 +-
libavformat/utils.c | 2 +-
libavutil/utils.c | 2 +-
libpostproc/postprocess.c | 2 +-
libswscale/utils.c | 2 +-
version.sh | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/cmdutils.c b/cmdutils.c
index 730ba63d63c..a0a1d59cd9b 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -425,7 +425,7 @@ static void print_all_libs_info(FILE* outstream, int flags)
void show_banner(void)
{
- fprintf(stderr, "%s version " LIBAV_VERSION ", Copyright (c) %d-%d the Libav developers\n",
+ fprintf(stderr, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d the FFmpeg developers\n",
program_name, program_birth_year, this_year);
fprintf(stderr, " built on %s %s with %s %s\n",
__DATE__, __TIME__, CC_TYPE, CC_VERSION);
@@ -435,7 +435,7 @@ void show_banner(void)
}
void show_version(void) {
- printf("%s " LIBAV_VERSION "\n", program_name);
+ printf("%s " FFMPEG_VERSION "\n", program_name);
print_all_libs_info(stdout, SHOW_VERSION);
}
diff --git a/configure b/configure
index 9ac19696e41..e42a6e8cff9 100755
--- a/configure
+++ b/configure
@@ -3296,7 +3296,7 @@ cat > $TMPH <<EOF
#ifndef LIBAV_CONFIG_H
#define LIBAV_CONFIG_H
#define LIBAV_CONFIGURATION "$(c_escape $LIBAV_CONFIGURATION)"
-#define LIBAV_LICENSE "$(c_escape $license)"
+#define FFMPEG_LICENSE "$(c_escape $license)"
#define FFMPEG_DATADIR "$(eval c_escape $datadir)"
#define CC_TYPE "$cc_type"
#define CC_VERSION $cc_version
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 5a39bff1686..a2b2f514994 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1084,7 +1084,7 @@ const char *avcodec_configuration(void)
const char *avcodec_license(void)
{
#define LICENSE_PREFIX "libavcodec license: "
- return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+ return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
}
void avcodec_init(void)
diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c
index 6c363feaa44..01db8776ac4 100644
--- a/libavdevice/avdevice.c
+++ b/libavdevice/avdevice.c
@@ -31,5 +31,5 @@ const char * avdevice_configuration(void)
const char * avdevice_license(void)
{
#define LICENSE_PREFIX "libavdevice license: "
- return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+ return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
}
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index a46bc53d6ae..c0ead5c4beb 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -40,7 +40,7 @@ const char *avfilter_configuration(void)
const char *avfilter_license(void)
{
#define LICENSE_PREFIX "libavfilter license: "
- return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+ return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
}
AVFilterBufferRef *avfilter_ref_buffer(AVFilterBufferRef *ref, int pmask)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 89eb557647a..a01046624c2 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -60,7 +60,7 @@ const char *avformat_configuration(void)
const char *avformat_license(void)
{
#define LICENSE_PREFIX "libavformat license: "
- return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+ return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
}
/* fraction handling */
diff --git a/libavutil/utils.c b/libavutil/utils.c
index 52152f5af3d..488bac4cc3d 100644
--- a/libavutil/utils.c
+++ b/libavutil/utils.c
@@ -37,5 +37,5 @@ const char *avutil_configuration(void)
const char *avutil_license(void)
{
#define LICENSE_PREFIX "libavutil license: "
- return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+ return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
}
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index 6834dd723dc..7466b18be33 100644
--- a/libpostproc/postprocess.c
+++ b/libpostproc/postprocess.c
@@ -100,7 +100,7 @@ const char *postproc_configuration(void)
const char *postproc_license(void)
{
#define LICENSE_PREFIX "libpostproc license: "
- return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+ return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
}
#if HAVE_ALTIVEC_H
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 15702972582..34988a0c66c 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -59,7 +59,7 @@ const char *swscale_configuration(void)
const char *swscale_license(void)
{
#define LICENSE_PREFIX "libswscale license: "
- return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+ return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
}
#define RET 0xC3 //near return opcode for x86
diff --git a/version.sh b/version.sh
index be67dc14efa..be639450149 100755
--- a/version.sh
+++ b/version.sh
@@ -23,7 +23,7 @@ if [ -z "$2" ]; then
exit
fi
-NEW_REVISION="#define LIBAV_VERSION \"$version\""
+NEW_REVISION="#define FFMPEG_VERSION \"$version\""
OLD_REVISION=$(cat version.h 2> /dev/null)
# Update version.h only on revision changes to avoid spurious rebuilds
--
GitLab