Merge commit 'b68e353136db6f963212c457281d9716516cdc59'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 12:11:51 +0000 (14:11 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 12:11:51 +0000 (14:11 +0200)
* commit 'b68e353136db6f963212c457281d9716516cdc59':
  qsvdec: do not sync PIX_FMT_QSV surfaces

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

Simple merge
@@@ -27,9 -27,9 +27,9 @@@
  
  #include "libavutil/version.h"
  
 -#define LIBAVCODEC_VERSION_MAJOR 57
 -#define LIBAVCODEC_VERSION_MINOR 30
 -#define LIBAVCODEC_VERSION_MICRO  4
 +#define LIBAVCODEC_VERSION_MAJOR  57
 +#define LIBAVCODEC_VERSION_MINOR  94
- #define LIBAVCODEC_VERSION_MICRO 100
++#define LIBAVCODEC_VERSION_MICRO 101
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \