diff options
| author | James Almer <jamrial@gmail.com> | 2016-09-28 13:09:26 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-09-28 13:09:26 -0300 |
| commit | f013ba475b0dbf71e2804c57e67bf308ae636f2b (patch) | |
| tree | 4b6476c2ab67903e03a41afb115136fbc269338c /libavcodec/version.h | |
| parent | 3597d32e88c8e0c6e6f25fe73a9ebd235c879c2b (diff) | |
| parent | 5d560d38deca1e4705e6d3784d737363b9c830fe (diff) | |
Merge commit '5d560d38deca1e4705e6d3784d737363b9c830fe'
* commit '5d560d38deca1e4705e6d3784d737363b9c830fe':
pixfmt: Add ARIB STD-B76 color transfer characteristic
See 785038c92cc7fc1da437576382083246ca598fce
Conflicts:
libavcodec/options_table.h
libavcodec/version.h
libavutil/pixdesc.c
libavutil/version.h
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index e7778e9bc0..5889879c60 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 58 -#define LIBAVCODEC_VERSION_MICRO 102 +#define LIBAVCODEC_VERSION_MICRO 103 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |