@@ -423,7 +423,7 @@ static void print_all_libs_info(FILE* outstream, int flags)

 void show_banner(void)

 {

-    fprintf(stderr, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d the FFmpeg developers\n",

+    fprintf(stderr, "%s version " LIBAV_VERSION ", Copyright (c) %d-%d the Libav 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);

@@ -433,7 +433,7 @@ void show_banner(void)

 }

 void show_version(void) {

-    printf("%s " FFMPEG_VERSION "\n", program_name);

+    printf("%s " LIBAV_VERSION "\n", program_name);

     print_all_libs_info(stdout, SHOW_VERSION);

 }

@@ -3298,7 +3298,7 @@ cat > $TMPH <<EOF

 #ifndef LIBAV_CONFIG_H

 #define LIBAV_CONFIG_H

 #define LIBAV_CONFIGURATION "$(c_escape $LIBAV_CONFIGURATION)"

-#define FFMPEG_LICENSE "$(c_escape $license)"

+#define LIBAV_LICENSE "$(c_escape $license)"

 #define FFMPEG_DATADIR "$(eval c_escape $datadir)"

 #define CC_TYPE "$cc_type"

 #define CC_VERSION $cc_version

@@ -1041,7 +1041,7 @@ const char *avcodec_configuration(void)

 const char *avcodec_license(void)

 {

 #define LICENSE_PREFIX "libavcodec license: "

-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;

+    return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;

 }

 void avcodec_init(void)

@@ -31,5 +31,5 @@ const char * avdevice_configuration(void)

 const char * avdevice_license(void)

 {

 #define LICENSE_PREFIX "libavdevice license: "

-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;

+    return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;

 }

@@ -40,7 +40,7 @@ const char *avfilter_configuration(void)

 const char *avfilter_license(void)

 {

 #define LICENSE_PREFIX "libavfilter license: "

-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;

+    return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;

 }

 AVFilterBufferRef *avfilter_ref_buffer(AVFilterBufferRef *ref, int pmask)

@@ -57,7 +57,7 @@ const char *avformat_configuration(void)

 const char *avformat_license(void)

 {

 #define LICENSE_PREFIX "libavformat license: "

-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;

+    return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;

 }

 /* fraction handling */

@@ -37,5 +37,5 @@ const char *avutil_configuration(void)

 const char *avutil_license(void)

 {

 #define LICENSE_PREFIX "libavutil license: "

-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;

+    return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;

 }

@@ -100,7 +100,7 @@ const char *postproc_configuration(void)

 const char *postproc_license(void)

 {

 #define LICENSE_PREFIX "libpostproc license: "

-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;

+    return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;

 }

 #if HAVE_ALTIVEC_H

@@ -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

@@ -23,7 +23,7 @@ if [ -z "$2" ]; then

     exit

 fi

-NEW_REVISION="#define FFMPEG_VERSION \"$version\""

+NEW_REVISION="#define LIBAV_VERSION \"$version\""

 OLD_REVISION=$(cat version.h 2> /dev/null)

 # Update version.h only on revision changes to avoid spurious rebuilds