diff options
| author | James Almer <jamrial@gmail.com> | 2016-09-28 13:12:18 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-09-28 13:12:18 -0300 |
| commit | 6e76c9c45018b9cea383ff1c3f17d08792623509 (patch) | |
| tree | bcfdbc8086bde9c940976a6144fb9737b31c09ef /libavcodec/version.h | |
| parent | f013ba475b0dbf71e2804c57e67bf308ae636f2b (diff) | |
| parent | a8164323374e86ce5f93759230868c98356833a2 (diff) | |
| download | ffmpeg-6e76c9c45018b9cea383ff1c3f17d08792623509.tar.gz | |
Merge commit 'a8164323374e86ce5f93759230868c98356833a2'
* commit 'a8164323374e86ce5f93759230868c98356833a2':
pixdesc: Add new SMPTE 431, 432, and 2085 color properties
Conflicts:
libavcodec/options_table.h
libavcodec/version.h
libavutil/pixdesc.c
libavutil/pixfmt.h
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 5889879c60..c583da0b4e 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 103 +#define LIBAVCODEC_VERSION_MICRO 104 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |