Merge commit '5c437fb'

* commit '5c437fb':
  lavu: Add values for various Dolby flags to the AVMatrixEncoding enum.

Conflicts:
	doc/APIchanges
	libavutil/version.h

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

diff --cc doc/APIchanges
index fe6ddce,376a745..7e7b154
--- 1/doc/APIchanges
--- 2/doc/APIchanges
+++ b/doc/APIchanges
@@@ -15,18 -13,11 +15,21 @@@ libavutil:     2012-10-2
  
  API changes, most recent first:
  
 -2013-12-xx - xxxxxxx - lavc 55.30.0 - avcodec.h
 -  Add HEVC profiles
+ 2013-12-xx - xxxxxxx - lavu 53.1.0 - channel_layout.h
+   Add values for various Dolby flags to the AVMatrixEncoding enum.
+ 
 +2014-01-04 - xxxxxxx - lavu 52.60.100 - mathematics.h
 +  Add av_add_stable() function.
 +
 +2013-12-22 - xxxxxxx - lavu 52.59.100 - avstring.h
 +  Add av_strnlen() function.
 +
 +2013-12-xx - xxxxxxx - lavu 52.57.100 - opencl.h
 +  Add av_opencl_benchmark() function.
 +
 +2013-11-xx - xxxxxxx - lavu 52.56.100 - ffversion.h
 +  Moves version.h to libavutil/ffversion.h.
 +  Install ffversion.h and make it public.
  
  2013-12-xx - xxxxxxx - lavc 55.28.1 - avcodec.h
    av_frame_alloc(), av_frame_unref() and av_frame_free() now can and should be

diff --cc libavutil/channel_layout.h
Simple merge

diff --cc libavutil/version.h
index 833d4ee,01c932c..e6a0f25
--- 1/libavutil/version.h
--- 2/libavutil/version.h
+++ b/libavutil/version.h
@@@ -55,9 -53,9 +55,9 @@@
   * @{
   */
  
 -#define LIBAVUTIL_VERSION_MAJOR 53
 -#define LIBAVUTIL_VERSION_MINOR  1
 -#define LIBAVUTIL_VERSION_MICRO  0
 +#define LIBAVUTIL_VERSION_MAJOR  52
- #define LIBAVUTIL_VERSION_MINOR  60
++#define LIBAVUTIL_VERSION_MINOR  61
 +#define LIBAVUTIL_VERSION_MICRO 100
  
  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                 LIBAVUTIL_VERSION_MINOR, \