From 29ba091136a5e04574f7bfc1b17536c923958f6f Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Mon, 14 Mar 2011 22:23:10 +0100 Subject: replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION also update the multiple inclusion guards in config.h|mak --- libswscale/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libswscale/utils.c') diff --git a/libswscale/utils.c b/libswscale/utils.c index 166e983477..34988a0c66 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -53,7 +53,7 @@ unsigned swscale_version(void) const char *swscale_configuration(void) { - return FFMPEG_CONFIGURATION; + return LIBAV_CONFIGURATION; } const char *swscale_license(void) -- cgit v1.2.3 From a03be6e1ba4cbf9984b0bbdb674704bbb2da6713 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Mon, 14 Mar 2011 22:27:40 +0100 Subject: use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_* --- libswscale/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libswscale/utils.c') diff --git a/libswscale/utils.c b/libswscale/utils.c index 34988a0c66..1570297258 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 FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1; + return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1; } #define RET 0xC3 //near return opcode for x86 -- cgit v1.2.3