Message ID | 20191219050907.15041-1-lance.lmwang@gmail.com |
---|---|
State | Superseded |
Headers | show |
On Thu, Dec 19, 2019 at 13:09:03 +0800, lance.lmwang@gmail.com wrote: > +2019-12-17 - xxxxxxxxxx - lavu 56.37.101 - frame.h [...] > #define LIBAVUTIL_VERSION_MAJOR 56 > -#define LIBAVUTIL_VERSION_MINOR 36 > +#define LIBAVUTIL_VERSION_MINOR 37 > #define LIBAVUTIL_VERSION_MICRO 101 When bumping major, you need to reset minor to 100. Moritz
On Wed, Jan 01, 2020 at 09:45:19PM +0100, Moritz Barsnick wrote: > On Thu, Dec 19, 2019 at 13:09:03 +0800, lance.lmwang@gmail.com wrote: > > +2019-12-17 - xxxxxxxxxx - lavu 56.37.101 - frame.h > [...] > > #define LIBAVUTIL_VERSION_MAJOR 56 > > -#define LIBAVUTIL_VERSION_MINOR 36 > > +#define LIBAVUTIL_VERSION_MINOR 37 > > #define LIBAVUTIL_VERSION_MICRO 101 > > When bumping major, you need to reset minor to 100. Sure, I'll resend it. > > Moritz > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/doc/APIchanges b/doc/APIchanges index 401c65a753..7955dfa659 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2019-12-17 - xxxxxxxxxx - lavu 56.37.101 - frame.h + Add AV_FRAME_DATA_USER_DATA_UNREGISTERED. + 2019-11-17 - 1c23abc88f - lavu 56.36.100 - eval API Add av_expr_count_vars(). diff --git a/libavutil/frame.c b/libavutil/frame.c index e4038096c2..1d0faec687 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -842,6 +842,7 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type) #endif case AV_FRAME_DATA_DYNAMIC_HDR_PLUS: return "HDR Dynamic Metadata SMPTE2094-40 (HDR10+)"; case AV_FRAME_DATA_REGIONS_OF_INTEREST: return "Regions Of Interest"; + case AV_FRAME_DATA_USER_DATA_UNREGISTERED: return "User Data Unregistered"; } return NULL; } diff --git a/libavutil/frame.h b/libavutil/frame.h index b5afb58634..9e8c3a9009 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -179,6 +179,14 @@ enum AVFrameSideDataType { * array element is implied by AVFrameSideData.size / AVRegionOfInterest.self_size. */ AV_FRAME_DATA_REGIONS_OF_INTEREST, + + /** + * User data unregistered metadata associated with a video frame. + * This data payload is stored as uint8_t in AVFrameSideData.data. + * The number of bytes of data payload is AVFrameSideData.size. + * The data payload consists of 16 bytes UUID and real user data. + */ + AV_FRAME_DATA_USER_DATA_UNREGISTERED, }; enum AVActiveFormatDescription { diff --git a/libavutil/version.h b/libavutil/version.h index e18163388d..f45e74fb95 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 56 -#define LIBAVUTIL_VERSION_MINOR 36 +#define LIBAVUTIL_VERSION_MINOR 37 #define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \