virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*"

Browse Source 
This reverts commit a03be6e1ba.
This commit is contained in:
Michael Niedermayer 2011-03-17 16:57:37 +01:00
parent a6be21d3ba
commit 0cb88628fb
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmdutils.c
View File

@ -425,7 +425,7 @@ static void print_all_libs_info(FILE* outstream, int flags)
void show_banner(void) 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); program_name, program_birth_year, this_year);
fprintf(stderr, " built on %s %s with %s %s\n", fprintf(stderr, " built on %s %s with %s %s\n",
__DATE__, __TIME__, CC_TYPE, CC_VERSION); __DATE__, __TIME__, CC_TYPE, CC_VERSION);
@ -435,7 +435,7 @@ void show_banner(void)
} }
void show_version(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); print_all_libs_info(stdout, SHOW_VERSION);
} }

2
configure vendored
View File

@ -3296,7 +3296,7 @@ cat > $TMPH <<EOF
#ifndef LIBAV_CONFIG_H #ifndef LIBAV_CONFIG_H
#define LIBAV_CONFIG_H #define LIBAV_CONFIG_H
#define LIBAV_CONFIGURATION "$(c_escape $LIBAV_CONFIGURATION)" #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 FFMPEG_DATADIR "$(eval c_escape $datadir)"
#define CC_TYPE "$cc_type" #define CC_TYPE "$cc_type"
#define CC_VERSION $cc_version #define CC_VERSION $cc_version

2
libavcodec/utils.c
View File

@ -1084,7 +1084,7 @@ const char *avcodec_configuration(void)
const char *avcodec_license(void) const char *avcodec_license(void)
{ {
#define LICENSE_PREFIX "libavcodec license: " #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) void avcodec_init(void)

2
libavdevice/avdevice.c
View File

@ -31,5 +31,5 @@ const char * avdevice_configuration(void)
const char * avdevice_license(void) const char * avdevice_license(void)
{ {
#define LICENSE_PREFIX "libavdevice license: " #define LICENSE_PREFIX "libavdevice license: "
return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1; return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
} }

2
libavfilter/avfilter.c
View File

@ -40,7 +40,7 @@ const char *avfilter_configuration(void)
const char *avfilter_license(void) const char *avfilter_license(void)
{ {
#define LICENSE_PREFIX "libavfilter license: " #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) AVFilterBufferRef *avfilter_ref_buffer(AVFilterBufferRef *ref, int pmask)

2
libavformat/utils.c
View File

@ -60,7 +60,7 @@ const char *avformat_configuration(void)
const char *avformat_license(void) const char *avformat_license(void)
{ {
#define LICENSE_PREFIX "libavformat license: " #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 */ /* fraction handling */

2
libavutil/utils.c
View File

@ -37,5 +37,5 @@ const char *avutil_configuration(void)
const char *avutil_license(void) const char *avutil_license(void)
{ {
#define LICENSE_PREFIX "libavutil license: " #define LICENSE_PREFIX "libavutil license: "
return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1; return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
} }

2
libpostproc/postprocess.c
View File

@ -100,7 +100,7 @@ const char *postproc_configuration(void)
const char *postproc_license(void) const char *postproc_license(void)
{ {
#define LICENSE_PREFIX "libpostproc license: " #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 #if HAVE_ALTIVEC_H

2
libswscale/utils.c
View File

@ -59,7 +59,7 @@ const char *swscale_configuration(void)
const char *swscale_license(void) const char *swscale_license(void)
{ {
#define LICENSE_PREFIX "libswscale license: " #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 #define RET 0xC3 //near return opcode for x86

2
version.sh
View File

@ -23,7 +23,7 @@ if [ -z "$2" ]; then
exit exit
fi fi
NEW_REVISION="#define LIBAV_VERSION \"$version\"" NEW_REVISION="#define FFMPEG_VERSION \"$version\""
OLD_REVISION=$(cat version.h 2> /dev/null) OLD_REVISION=$(cat version.h 2> /dev/null)
# Update version.h only on revision changes to avoid spurious rebuilds # Update version.h only on revision changes to avoid spurious rebuilds