ffmpeg | branch: master | Hendrik Leppkes <[email protected]> | Sun Jun 26 14:49:10 2016 +0200| [b95534bb674acfe7689ca03cb4fa215c28f8f44f] | committer: Hendrik Leppkes
Merge commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298' * commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298': avcodec: Bump micro version after changing public JPEG 2000 defines Merged-by: Hendrik Leppkes <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b95534bb674acfe7689ca03cb4fa215c28f8f44f --- doc/APIchanges | 3 +++ libavcodec/version.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 12a6fae..bc030bf 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 6ce6fc7..4f6423b 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, \ ====================================================================== diff --cc doc/APIchanges index 12a6fae,6cd0a49..bc030bf --- a/doc/APIchanges +++ b/doc/APIchanges @@@ -15,9 -13,10 +15,12 @@@ libavutil: 2015-08-2 API changes, most recent first: -2016-xx-xx - xxxxxxx - lavc 57.19.1 - avcodec.h ++2016-06-26 - xxxxxxx / e47b8bb - lavc 57.48.101 / 57.19.1 - avcodec.h + Adjust values for JPEG 2000 profiles. + -2016-xx-xx - xxxxxxx - lavf 57.7.0 - avio.h +-------- 8< --------- FFmpeg 3.1 was cut here -------- 8< --------- + +2016-06-23 - 5d75e46 / db7968b - lavf 57.40.100 / 57.7.0 - avio.h Add AVIODataMarkerType, write_data_type, ignore_boundary_point and avio_write_marker. diff --cc libavcodec/version.h index 6ce6fc7,4bfa09c..4f6423b --- a/libavcodec/version.h +++ b/libavcodec/version.h @@@ -27,9 -27,9 +27,9 @@@ #include "libavutil/version.h" -#define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 19 -#define LIBAVCODEC_VERSION_MICRO 1 +#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, \ _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
