Merge commit '17dac56b8fdd80c594c39b76de3f27a7949afbde'
authorClément Bœsch <cboesch@gopro.com>
Fri, 31 Mar 2017 07:46:51 +0000 (09:46 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 31 Mar 2017 07:46:51 +0000 (09:46 +0200)
* commit '17dac56b8fdd80c594c39b76de3f27a7949afbde':
  lavu: Rename ycgco color space appropriately

Merged-by: Clément Bœsch <cboesch@gopro.com>
1  2 
libavcodec/options_table.h
libavcodec/version.h
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h

Simple merge
@@@ -27,9 -27,9 +27,9 @@@
  
  #include "libavutil/version.h"
  
 -#define LIBAVCODEC_VERSION_MAJOR 57
 -#define LIBAVCODEC_VERSION_MINOR 28
 -#define LIBAVCODEC_VERSION_MICRO  3
 +#define LIBAVCODEC_VERSION_MAJOR  57
 +#define LIBAVCODEC_VERSION_MINOR  86
- #define LIBAVCODEC_VERSION_MICRO 103
++#define LIBAVCODEC_VERSION_MICRO 104
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \
Simple merge
Simple merge
@@@ -78,9 -53,9 +78,9 @@@
   * @{
   */
  
 -#define LIBAVUTIL_VERSION_MAJOR 55
 -#define LIBAVUTIL_VERSION_MINOR 29
 -#define LIBAVUTIL_VERSION_MICRO  0
 +#define LIBAVUTIL_VERSION_MAJOR  55
- #define LIBAVUTIL_VERSION_MINOR  53
++#define LIBAVUTIL_VERSION_MINOR  54
 +#define LIBAVUTIL_VERSION_MICRO 100
  
  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                 LIBAVUTIL_VERSION_MINOR, \