Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"

This reverts commit 29ba091136a5e04574f7bfc1b17536c923958f6f.

Michael Niedermayer committed 15 years ago

Commit e528cda1 parent 0cb886210 files · +21 −21Browse files

Unified · Split

10 files

Makefile +1 −1
cmdutils.c +2 −2
configure +11 −11
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

@@ -177,7 +177,7 @@ distclean:: · 176 unmodified lines
177	$(RM) version.h config.* libavutil/avconfig.h	177	$(RM) version.h config.* libavutil/avconfig.h
178		178
179	config:	179	config:
180	$(SRC_PATH)/configure $(value LIBAV_CONFIGURATION)	180	$(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)
181		181
182	# regression tests	182	# regression tests
183		183

cmdutils.c+2−2

@@ -399,7 +399,7 @@ static int warned_cfg = 0; · 398 unmodified lines
399	} \	399	} \
400	if (flags & SHOW_CONFIG) { \	400	if (flags & SHOW_CONFIG) { \
401	const char *cfg = libname##_configuration(); \	401	const char *cfg = libname##_configuration(); \
402	if (strcmp(LIBAV_CONFIGURATION, cfg)) { \	402	if (strcmp(FFMPEG_CONFIGURATION, cfg)) { \
403	if (!warned_cfg) { \	403	if (!warned_cfg) { \
404	fprintf(outstream, \	404	fprintf(outstream, \
405	"%sWARNING: library configuration mismatch\n", \	405	"%sWARNING: library configuration mismatch\n", \
@@ -429,7 +429,7 @@ void show_banner(void) · 23 unmodified lines
429	program_name, program_birth_year, this_year);	429	program_name, program_birth_year, this_year);
430	fprintf(stderr, " built on %s %s with %s %s\n",	430	fprintf(stderr, " built on %s %s with %s %s\n",
431	__DATE__, __TIME__, CC_TYPE, CC_VERSION);	431	__DATE__, __TIME__, CC_TYPE, CC_VERSION);
432	fprintf(stderr, " configuration: " LIBAV_CONFIGURATION "\n");	432	fprintf(stderr, " configuration: " FFMPEG_CONFIGURATION "\n");
433	print_all_libs_info(stderr, INDENT\|SHOW_CONFIG);	433	print_all_libs_info(stderr, INDENT\|SHOW_CONFIG);
434	print_all_libs_info(stderr, INDENT\|SHOW_VERSION);	434	print_all_libs_info(stderr, INDENT\|SHOW_VERSION);
435	}	435	}

configure+11−11

@@ -1672,7 +1672,7 @@ for v in "$@"; do · 1671 unmodified lines
1672	r=${v#*=}	1672	r=${v#*=}
1673	l=${v%"$r"}	1673	l=${v%"$r"}
1674	r=$(sh_quote "$r")	1674	r=$(sh_quote "$r")
1675	LIBAV_CONFIGURATION="${LIBAV_CONFIGURATION# } ${l}${r}"	1675	FFMPEG_CONFIGURATION="${FFMPEG_CONFIGURATION# } ${l}${r}"
1676	done	1676	done
1677		1677
1678	find_things(){	1678	find_things(){
@@ -1784,7 +1784,7 @@ done · 105 unmodified lines
1784		1784
1785	disabled logging && logfile=/dev/null	1785	disabled logging && logfile=/dev/null
1786		1786
1787	echo "# $0 $LIBAV_CONFIGURATION" > $logfile	1787	echo "# $0 $FFMPEG_CONFIGURATION" > $logfile
1788	set >> $logfile	1788	set >> $logfile
1789		1789
1790	test -n "$cross_prefix" && enable cross_compile	1790	test -n "$cross_prefix" && enable cross_compile
@@ -2479,7 +2479,7 @@ case $target_os in · 688 unmodified lines
2479	;;	2479	;;
2480	esac	2480	esac
2481		2481
2482	echo "config:$arch:$subarch:$cpu:$target_os:$cc_ident:$LIBAV_CONFIGURATION" >config.fate	2482	echo "config:$arch:$subarch:$cpu:$target_os:$cc_ident:$FFMPEG_CONFIGURATION" >config.fate
2483		2483
2484	check_cpp_condition stdlib.h "defined(__PIC__) \|\| defined(__pic__) \|\| defined(PIC)" && enable pic	2484	check_cpp_condition stdlib.h "defined(__PIC__) \|\| defined(__pic__) \|\| defined(PIC)" && enable pic
2485		2485
@@ -3202,9 +3202,9 @@ config_files="$TMPH config.mak" · 716 unmodified lines
3202		3202
3203	cat > config.mak <<EOF	3203	cat > config.mak <<EOF
3204	# Automatically generated by configure - do not modify!	3204	# Automatically generated by configure - do not modify!
3205	ifndef LIBAV_CONFIG_MAK	3205	ifndef FFMPEG_CONFIG_MAK
3206	LIBAV_CONFIG_MAK=1	3206	FFMPEG_CONFIG_MAK=1
3207	LIBAV_CONFIGURATION=$LIBAV_CONFIGURATION	3207	FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION
3208	prefix=$prefix	3208	prefix=$prefix
3209	LIBDIR=\$(DESTDIR)$libdir	3209	LIBDIR=\$(DESTDIR)$libdir
3210	SHLIBDIR=\$(DESTDIR)$shlibdir	3210	SHLIBDIR=\$(DESTDIR)$shlibdir
@@ -3293,9 +3293,9 @@ get_version LIBAVFILTER libavfilter/avfilter.h · 82 unmodified lines
3293		3293
3294	cat > $TMPH <<EOF	3294	cat > $TMPH <<EOF
3295	/* Automatically generated by configure - do not modify! */	3295	/* Automatically generated by configure - do not modify! */
3296	#ifndef LIBAV_CONFIG_H	3296	#ifndef FFMPEG_CONFIG_H
3297	#define LIBAV_CONFIG_H	3297	#define FFMPEG_CONFIG_H
3298	#define LIBAV_CONFIGURATION "$(c_escape $LIBAV_CONFIGURATION)"	3298	#define FFMPEG_CONFIGURATION "$(c_escape $FFMPEG_CONFIGURATION)"
3299	#define FFMPEG_LICENSE "$(c_escape $license)"	3299	#define FFMPEG_LICENSE "$(c_escape $license)"
3300	#define FFMPEG_DATADIR "$(eval c_escape $datadir)"	3300	#define FFMPEG_DATADIR "$(eval c_escape $datadir)"
3301	#define CC_TYPE "$cc_type"	3301	#define CC_TYPE "$cc_type"
@@ -3347,8 +3347,8 @@ LAVFI_TESTS=$(print_enabled -n _test $LAVFI_TESTS) · 45 unmodified lines
3347	SEEK_TESTS=$(print_enabled -n _test $SEEK_TESTS)	3347	SEEK_TESTS=$(print_enabled -n _test $SEEK_TESTS)
3348	EOF	3348	EOF
3349		3349
3350	echo "#endif /* LIBAV_CONFIG_H */" >> $TMPH	3350	echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
3351	echo "endif # LIBAV_CONFIG_MAK" >> config.mak	3351	echo "endif # FFMPEG_CONFIG_MAK" >> config.mak
3352		3352
3353	# Do not overwrite an unchanged config.h to avoid superfluous rebuilds.	3353	# Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
3354	cp_if_changed $TMPH config.h	3354	cp_if_changed $TMPH config.h

libavcodec/utils.c+1−1

@@ -1078,7 +1078,7 @@ unsigned avcodec_version( void ) · 1077 unmodified lines
1078		1078
1079	const char *avcodec_configuration(void)	1079	const char *avcodec_configuration(void)
1080	{	1080	{
1081	return LIBAV_CONFIGURATION;	1081	return FFMPEG_CONFIGURATION;
1082	}	1082	}
1083		1083
1084	const char *avcodec_license(void)	1084	const char *avcodec_license(void)

libavdevice/avdevice.c+1−1

@@ -25,7 +25,7 @@ unsigned avdevice_version(void) · 24 unmodified lines
25		25
26	const char * avdevice_configuration(void)	26	const char * avdevice_configuration(void)
27	{	27	{
28	return LIBAV_CONFIGURATION;	28	return FFMPEG_CONFIGURATION;
29	}	29	}
30		30
31	const char * avdevice_license(void)	31	const char * avdevice_license(void)

libavfilter/avfilter.c+1−1

@@ -34,7 +34,7 @@ unsigned avfilter_version(void) { · 33 unmodified lines
34		34
35	const char *avfilter_configuration(void)	35	const char *avfilter_configuration(void)
36	{	36	{
37	return LIBAV_CONFIGURATION;	37	return FFMPEG_CONFIGURATION;
38	}	38	}
39		39
40	const char *avfilter_license(void)	40	const char *avfilter_license(void)

libavformat/utils.c+1−1

@@ -54,7 +54,7 @@ unsigned avformat_version(void) · 53 unmodified lines
54		54
55	const char *avformat_configuration(void)	55	const char *avformat_configuration(void)
56	{	56	{
57	return LIBAV_CONFIGURATION;	57	return FFMPEG_CONFIGURATION;
58	}	58	}
59		59
60	const char *avformat_license(void)	60	const char *avformat_license(void)

libavutil/utils.c+1−1

@@ -31,7 +31,7 @@ unsigned avutil_version(void) · 30 unmodified lines
31		31
32	const char *avutil_configuration(void)	32	const char *avutil_configuration(void)
33	{	33	{
34	return LIBAV_CONFIGURATION;	34	return FFMPEG_CONFIGURATION;
35	}	35	}
36		36
37	const char *avutil_license(void)	37	const char *avutil_license(void)

libpostproc/postprocess.c+1−1

@@ -94,7 +94,7 @@ unsigned postproc_version(void) · 93 unmodified lines
94		94
95	const char *postproc_configuration(void)	95	const char *postproc_configuration(void)
96	{	96	{
97	return LIBAV_CONFIGURATION;	97	return FFMPEG_CONFIGURATION;
98	}	98	}
99		99
100	const char *postproc_license(void)	100	const char *postproc_license(void)

libswscale/utils.c+1−1

@@ -53,7 +53,7 @@ unsigned swscale_version(void) · 52 unmodified lines
53		53
54	const char *swscale_configuration(void)	54	const char *swscale_configuration(void)
55	{	55	{
56	return LIBAV_CONFIGURATION;	56	return FFMPEG_CONFIGURATION;
57	}	57	}
58		58
59	const char *swscale_license(void)	59	const char *swscale_license(void)

Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code