Merge commit '21f68c2489cba2a1a4a41d0c5c828266e6162800'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 23 May 2014 18:48:54 +0000 (20:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 23 May 2014 18:48:54 +0000 (20:48 +0200)
* commit '21f68c2489cba2a1a4a41d0c5c828266e6162800':
  avcodec: bump version after rotation api

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/APIchanges
libavcodec/version.h

diff --cc doc/APIchanges
@@@ -26,7 -21,7 +26,7 @@@ API changes, most recent first
    Add AV_FRAME_DATA_DISPLAYMATRIX for exporting frame-level
    spatial rendering on video frames for proper display.
  
- 2014-05-xx - xxxxxxx - lavc 55.52.0 - avcodec.h
 -2014-05-xx - xxxxxxx - lavc 55.53.0 - avcodec.h
++2014-05-xx - xxxxxxx - lavc 55.64.100 / 55.53.0 - avcodec.h
    Add AV_PKT_DATA_DISPLAYMATRIX for exporting packet-level
    spatial rendering on video frames for proper display.
  
@@@ -29,8 -29,8 +29,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVCODEC_VERSION_MAJOR 55
- #define LIBAVCODEC_VERSION_MINOR  63
 -#define LIBAVCODEC_VERSION_MINOR 53
 -#define LIBAVCODEC_VERSION_MICRO  0
++#define LIBAVCODEC_VERSION_MINOR  64
 +#define LIBAVCODEC_VERSION_MICRO 100
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \