Merge commit '1316df7aa98c4784f190d107206d0bb12c590b89'

* commit '1316df7aa98c4784f190d107206d0bb12c590b89':
  lavu: add an API function to return the Libav version string

Conflicts:
	.gitignore
	Makefile
	cmdutils.c
	doc/APIchanges
	libavutil/avutil.h
	libavutil/utils.c

See: f91126643a
Merged-by: Michael Niedermayer <michaelni@gmx.at>

.gitignore

@@ -28,6 +28,7 @@
 /ffserver
 /config.*
 /coverage.info
+/avversion.h
 /doc/*.1
 /doc/*.3
 /doc/*.html

Makefile

@@ -175,7 +175,7 @@ clean::
 
 distclean::
 	$(RM) $(DISTCLEANSUFFIXES)
-	$(RM) config.* .config libavutil/avconfig.h .version version.h libavutil/ffversion.h libavcodec/codec_names.h
+	$(RM) config.* .config libavutil/avconfig.h .version avversion.h version.h libavutil/ffversion.h libavcodec/codec_names.h
 
 config:
 	$(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)

doc/APIchanges

@@ -15,8 +15,8 @@ libavutil:     2014-08-09
 
 API changes, most recent first:
 
-2015-xx-xx - xxxxxx - lavu  53.xx.100
-  Add avutil_version_info().
+2015-xx-xx - xxxxxxx - lavu 56.xx.0
+  Add av_version_info().
 
 -------- 8< --------- FFmpeg 2.7 was cut here -------- 8< ---------
 

libavutil/avutil.h

@@ -171,11 +171,11 @@
 unsigned avutil_version(void);
 
 /**
- * Return an informative version string. This usually the actual release version
- * number and a git hash. This string has no fixed format and can change any
- * time. It should never be parsed by code.
+ * Return an informative version string. This usually is the actual release
+ * version number or a git commit description. This string has no fixed format
+ * and can change any time. It should never be parsed by code.
  */
-const char *avutil_version_info(void);
+const char *av_version_info(void);
 
 /**
  * Return the libavutil build-time configuration.

libavutil/utils.c

@@ -30,7 +30,7 @@
 #include "libavutil/ffversion.h"
 const char av_util_ffversion[] = "FFmpeg version " FFMPEG_VERSION;
 
-const char *avutil_version_info(void)
+const char *av_version_info(void)
 {
     return FFMPEG_VERSION;
 }