Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0'

* commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0':
  avutil: Move library version related macros to version.h

Conflicts:
	libavcodec/version.h
	libavresample/version.h
	libavutil/avutil.h
	libavutil/utils.c

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

diff --cc libavcodec/version.h
index 0d75976,73c786d..06af735
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -26,11 -26,11 +26,11 @@@
   * Libavcodec version macros.
   */
  
- #include "libavutil/avutil.h"
+ #include "libavutil/version.h"
  
  #define LIBAVCODEC_VERSION_MAJOR 55
 -#define LIBAVCODEC_VERSION_MINOR 31
 -#define LIBAVCODEC_VERSION_MICRO  0
 +#define LIBAVCODEC_VERSION_MINOR  46
 +#define LIBAVCODEC_VERSION_MICRO 100
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \

diff --cc libavdevice/version.h
index 0bbd48e,487b4c0..d569fae
--- 1/libavdevice/version.h
--- 2/libavdevice/version.h
+++ b/libavdevice/version.h
@@@ -25,11 -25,11 +25,11 @@@
   * Libavdevice version macros
   */
  
- #include "libavutil/avutil.h"
+ #include "libavutil/version.h"
  
 -#define LIBAVDEVICE_VERSION_MAJOR 54
 -#define LIBAVDEVICE_VERSION_MINOR  0
 -#define LIBAVDEVICE_VERSION_MICRO  0
 +#define LIBAVDEVICE_VERSION_MAJOR  55
 +#define LIBAVDEVICE_VERSION_MINOR   5
 +#define LIBAVDEVICE_VERSION_MICRO 102
  
  #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
                                                 LIBAVDEVICE_VERSION_MINOR, \

diff --cc libavfilter/version.h
index f6eb82e,f41114b..ff5b604
--- 1/libavfilter/version.h
--- 2/libavfilter/version.h
+++ b/libavfilter/version.h
@@@ -27,11 -27,11 +27,11 @@@
   * Libavfilter version macros
   */
  
- #include "libavutil/avutil.h"
+ #include "libavutil/version.h"
  
 -#define LIBAVFILTER_VERSION_MAJOR  4
 -#define LIBAVFILTER_VERSION_MINOR  0
 -#define LIBAVFILTER_VERSION_MICRO  0
 +#define LIBAVFILTER_VERSION_MAJOR   4
 +#define LIBAVFILTER_VERSION_MINOR   0
 +#define LIBAVFILTER_VERSION_MICRO 103
  
  #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                 LIBAVFILTER_VERSION_MINOR, \

diff --cc libavformat/version.h
index 4fe8364,a170c06..ee8679d
--- 1/libavformat/version.h
--- 2/libavformat/version.h
+++ b/libavformat/version.h
@@@ -27,11 -27,11 +27,11 @@@
   * Libavformat version macros
   */
  
- #include "libavutil/avutil.h"
+ #include "libavutil/version.h"
  
  #define LIBAVFORMAT_VERSION_MAJOR 55
 -#define LIBAVFORMAT_VERSION_MINOR 10
 -#define LIBAVFORMAT_VERSION_MICRO  1
 +#define LIBAVFORMAT_VERSION_MINOR 22
 +#define LIBAVFORMAT_VERSION_MICRO 100
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                 LIBAVFORMAT_VERSION_MINOR, \

diff --cc libavresample/version.h
Simple merge

diff --cc libavutil/utils.c
index 4c82503,2bb27de..9453c30
--- 1/libavutil/utils.c
--- 2/libavutil/utils.c
+++ b/libavutil/utils.c
@@@ -17,10 -17,7 +17,10 @@@
   */
  
  #include "config.h"
- #include "avutil.h"
+ #include "version.h"
 +#include "avassert.h"
 +#include "samplefmt.h"
 +#include "pixdesc.h"
  
  /**
   * @file

diff --cc libavutil/version.h
index a70a110,cf5cc2f..446e1f2
--- 1/libavutil/version.h
--- 2/libavutil/version.h
+++ b/libavutil/version.h
@@@ -21,26 -19,8 +21,27 @@@
  #ifndef AVUTIL_VERSION_H
  #define AVUTIL_VERSION_H
  
 -#include "avutil.h"
 +/**
 + * @defgroup preproc_misc Preprocessor String Macros
 + *
 + * String manipulation macros
 + *
 + * @{
 + */
 +
 +#define AV_STRINGIFY(s)         AV_TOSTRING(s)
 +#define AV_TOSTRING(s) #s
 +
 +#define AV_GLUE(a, b) a ## b
 +#define AV_JOIN(a, b) AV_GLUE(a, b)
 +
 +#define AV_PRAGMA(s) _Pragma(#s)
 +
 +/**
 + * @}
 + */
 +
+ 
  /**
   * @defgroup version_utils Library Version Macros
   *

diff --cc libswscale/version.h
index 360ec82,0f32c7a..99f3295
--- 1/libswscale/version.h
--- 2/libswscale/version.h
+++ b/libswscale/version.h
@@@ -24,11 -24,11 +24,11 @@@
   * swscale version macros
   */
  
- #include "libavutil/avutil.h"
+ #include "libavutil/version.h"
  
  #define LIBSWSCALE_VERSION_MAJOR 2
 -#define LIBSWSCALE_VERSION_MINOR 1
 -#define LIBSWSCALE_VERSION_MICRO 2
 +#define LIBSWSCALE_VERSION_MINOR 5
 +#define LIBSWSCALE_VERSION_MICRO 101
  
  #define LIBSWSCALE_VERSION_INT  AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
                                                 LIBSWSCALE_VERSION_MINOR, \