use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*

Janne Grunau committed 15 years ago

Commit a03be6e1 parent 29ba09110 files · +11 −11Browse files

Unified · Split

10 files

cmdutils.c +2 −2
configure +1 −1
libavcodec/utils.c +1 −1
libavdevice/avdevice.c +1 −1
libavfilter/avfilter.c +1 −1
libavformat/utils.c +1 −1
libavutil/utils.c +1 −1
libpostproc/postprocess.c +1 −1
libswscale/utils.c +1 −1
version.sh +1 −1

cmdutils.c+2−2

@@ -423,7 +423,7 @@ static void print_all_libs_info(FILE* outstream, int flags) · 422 unmodified lines
423		423
424	void show_banner(void)	424	void show_banner(void)
425	{	425	{
426	fprintf(stderr, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d the FFmpeg developers\n",	426	fprintf(stderr, "%s version " LIBAV_VERSION ", Copyright (c) %d-%d the Libav developers\n",
427	program_name, program_birth_year, this_year);	427	program_name, program_birth_year, this_year);
428	fprintf(stderr, " built on %s %s with %s %s\n",	428	fprintf(stderr, " built on %s %s with %s %s\n",
429	__DATE__, __TIME__, CC_TYPE, CC_VERSION);	429	__DATE__, __TIME__, CC_TYPE, CC_VERSION);
@@ -433,7 +433,7 @@ void show_banner(void) · 3 unmodified lines
433	}	433	}
434		434
435	void show_version(void) {	435	void show_version(void) {
436	printf("%s " FFMPEG_VERSION "\n", program_name);	436	printf("%s " LIBAV_VERSION "\n", program_name);
437	print_all_libs_info(stdout, SHOW_VERSION);	437	print_all_libs_info(stdout, SHOW_VERSION);
438	}	438	}
439		439

configure+1−1

@@ -3298,7 +3298,7 @@ cat > $TMPH <<EOF · 3297 unmodified lines
3298	#ifndef LIBAV_CONFIG_H	3298	#ifndef LIBAV_CONFIG_H
3299	#define LIBAV_CONFIG_H	3299	#define LIBAV_CONFIG_H
3300	#define LIBAV_CONFIGURATION "$(c_escape $LIBAV_CONFIGURATION)"	3300	#define LIBAV_CONFIGURATION "$(c_escape $LIBAV_CONFIGURATION)"
3301	#define FFMPEG_LICENSE "$(c_escape $license)"	3301	#define LIBAV_LICENSE "$(c_escape $license)"
3302	#define FFMPEG_DATADIR "$(eval c_escape $datadir)"	3302	#define FFMPEG_DATADIR "$(eval c_escape $datadir)"
3303	#define CC_TYPE "$cc_type"	3303	#define CC_TYPE "$cc_type"
3304	#define CC_VERSION $cc_version	3304	#define CC_VERSION $cc_version

libavcodec/utils.c+1−1

@@ -1041,7 +1041,7 @@ const char *avcodec_configuration(void) · 1040 unmodified lines
1041	const char *avcodec_license(void)	1041	const char *avcodec_license(void)
1042	{	1042	{
1043	#define LICENSE_PREFIX "libavcodec license: "	1043	#define LICENSE_PREFIX "libavcodec license: "
1044	return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;	1044	return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
1045	}	1045	}
1046		1046
1047	void avcodec_init(void)	1047	void avcodec_init(void)

libavdevice/avdevice.c+1−1

@@ -31,5 +31,5 @@ const char * avdevice_configuration(void) · 30 unmodified lines
31	const char * avdevice_license(void)	31	const char * avdevice_license(void)
32	{	32	{
33	#define LICENSE_PREFIX "libavdevice license: "	33	#define LICENSE_PREFIX "libavdevice license: "
34	return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;	34	return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
35	}	35	}

libavfilter/avfilter.c+1−1

@@ -40,7 +40,7 @@ const char *avfilter_configuration(void) · 39 unmodified lines
40	const char *avfilter_license(void)	40	const char *avfilter_license(void)
41	{	41	{
42	#define LICENSE_PREFIX "libavfilter license: "	42	#define LICENSE_PREFIX "libavfilter license: "
43	return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;	43	return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
44	}	44	}
45		45
46	AVFilterBufferRef avfilter_ref_buffer(AVFilterBufferRef ref, int pmask)	46	AVFilterBufferRef avfilter_ref_buffer(AVFilterBufferRef ref, int pmask)

libavformat/utils.c+1−1

@@ -57,7 +57,7 @@ const char *avformat_configuration(void) · 56 unmodified lines
57	const char *avformat_license(void)	57	const char *avformat_license(void)
58	{	58	{
59	#define LICENSE_PREFIX "libavformat license: "	59	#define LICENSE_PREFIX "libavformat license: "
60	return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;	60	return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
61	}	61	}
62		62
63	/* fraction handling */	63	/* fraction handling */

libavutil/utils.c+1−1

@@ -37,5 +37,5 @@ const char *avutil_configuration(void) · 36 unmodified lines
37	const char *avutil_license(void)	37	const char *avutil_license(void)
38	{	38	{
39	#define LICENSE_PREFIX "libavutil license: "	39	#define LICENSE_PREFIX "libavutil license: "
40	return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;	40	return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
41	}	41	}

libpostproc/postprocess.c+1−1

@@ -100,7 +100,7 @@ const char *postproc_configuration(void) · 99 unmodified lines
100	const char *postproc_license(void)	100	const char *postproc_license(void)
101	{	101	{
102	#define LICENSE_PREFIX "libpostproc license: "	102	#define LICENSE_PREFIX "libpostproc license: "
103	return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;	103	return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
104	}	104	}
105		105
106	#if HAVE_ALTIVEC_H	106	#if HAVE_ALTIVEC_H

libswscale/utils.c+1−1

@@ -59,7 +59,7 @@ const char *swscale_configuration(void) · 58 unmodified lines
59	const char *swscale_license(void)	59	const char *swscale_license(void)
60	{	60	{
61	#define LICENSE_PREFIX "libswscale license: "	61	#define LICENSE_PREFIX "libswscale license: "
62	return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;	62	return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
63	}	63	}
64		64
65	#define RET 0xC3 //near return opcode for x86	65	#define RET 0xC3 //near return opcode for x86

version.sh+1−1

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