diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 00:48:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 00:52:05 +0200 |
| commit | 0f630b7b1244e7fab3dc66c3fb396186f7c09065 (patch) | |
| tree | 85b064956994f96d05c098d1eb253dc2b7ebeb2e | |
| parent | 2548f8a237b1ef85d1b56a897e93d5af206e4654 (diff) | |
| parent | ed4b757177f9b563412cdbc8ee3405d82e10fc05 (diff) | |
Merge commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05'
* 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>
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index f43174f7af..8fe5ff2e7c 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -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(). diff --git a/libavcodec/version.h b/libavcodec/version.h index b786f0da6f..43a4cc4946 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -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, \ |