--- Rebased patch.
doc/APIchanges | 3 +++ libavutil/attributes.h | 6 ++++++ libavutil/version.h | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 8f6cdca..573c221 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,9 @@ libavutil: 2015-08-28 API changes, most recent first: +2016-xx-xx - xxxxxxx - lavu 55.11.0 - attributes.h + Add av_unlikely macro. + 2016-xx-xx - xxxxxxx - lavf 57.7.0 - avio.h Add AVIODataMarkerType, write_data_type, ignore_boundary_point and avio_write_marker. diff --git a/libavutil/attributes.h b/libavutil/attributes.h index d7f2bb5..1a8d738 100644 --- a/libavutil/attributes.h +++ b/libavutil/attributes.h @@ -123,4 +123,10 @@ # define av_noreturn #endif +#if AV_GCC_VERSION_AT_LEAST(4,3) +# define av_unlikely(x) __builtin_expect((x) != 0, 0) +#else +# define av_unlikely(x) x +#endif + #endif /* AVUTIL_ATTRIBUTES_H */ diff --git a/libavutil/version.h b/libavutil/version.h index 4cee2b0..48a5878 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -54,7 +54,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 12 +#define LIBAVUTIL_VERSION_MINOR 13 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ -- 2.1.4 _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
