diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-13 18:32:07 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-13 18:35:28 +0100 |
| commit | 2d7cf6f72ba20479109799e4cc9169b95e1b643d (patch) | |
| tree | 353301a565126b196688eb1c692bed1da4f5a1e9 /libavcodec/version.h | |
| parent | 724a71dced1c211fc64105ec9f1fb99d79f6ff35 (diff) | |
| parent | f172e22d6aed0bff36e975bafb0183b6779f9444 (diff) | |
| download | ffmpeg-2d7cf6f72ba20479109799e4cc9169b95e1b643d.tar.gz | |
Merge commit 'f172e22d6aed0bff36e975bafb0183b6779f9444'
* commit 'f172e22d6aed0bff36e975bafb0183b6779f9444':
pixdesc: Add aliases to SMPTE color properties
Merged-by: Hendrik Leppkes <h.leppkes@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 9799cfe137..e05c3107be 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 66 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |