Merge commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Apr 2014 22:48:25 +0000 (00:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Apr 2014 22:52:05 +0000 (00:52 +0200)
* commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05':
  dxva2_h264: add a workaround for old Intel GPUs

Conflicts:
doc/APIchanges
libavcodec/version.h

See: 8b2a130d3fe61e348092714dffa425b63c4d796c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/version.h

index f43174f..8fe5ff2 100644 (file)
@@ -15,6 +15,9 @@ libavutil:     2012-10-22
 
 API changes, most recent first:
 
+2014-03-07 - 8b2a130 - lavc 55.50.0 / 55.53.100 - dxva2.h
+  Add FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO for old Intel GPUs.
+
 2014-04-xx - xxxxxxx - lavu 53.13.0 / 52.78.100 - avutil.h
   Add av_get_time_base_q().
 
index b786f0d..43a4cc4 100644 (file)
@@ -30,7 +30,7 @@
 
 #define LIBAVCODEC_VERSION_MAJOR 55
 #define LIBAVCODEC_VERSION_MINOR  59
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \