diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 14:49:10 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 14:49:10 +0200 |
| commit | b95534bb674acfe7689ca03cb4fa215c28f8f44f (patch) | |
| tree | d111b6ccd31e8f1ce79a8f475b511861882ac1f6 | |
| parent | 46ff31d39c2e3dcb5237ecfac45316c0d13a57ed (diff) | |
| parent | e47b8bbf0b54599d44b9330eb4d68cdde4f6d298 (diff) | |
| download | ffmpeg-b95534bb674acfe7689ca03cb4fa215c28f8f44f.tar.gz | |
Merge commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298'
* commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298':
avcodec: Bump micro version after changing public JPEG 2000 defines
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -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 12a6fae260..bc030bf567 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2015-08-28 API changes, most recent first: +2016-06-26 - xxxxxxx / e47b8bb - lavc 57.48.101 / 57.19.1 - avcodec.h + Adjust values for JPEG 2000 profiles. + -------- 8< --------- FFmpeg 3.1 was cut here -------- 8< --------- 2016-06-23 - 5d75e46 / db7968b - lavf 57.40.100 / 57.7.0 - avio.h diff --git a/libavcodec/version.h b/libavcodec/version.h index 6ce6fc7715..4f6423b15e 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 48 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |