From: Gildas Cocherel <[email protected]>
---
Add API bump
Rename "Main10" to "Main 10" and "MainStillPicture" to "Main Still Picture"
doc/APIchanges | 3 +++
libavcodec/avcodec.h | 5 +++++
libavcodec/hevc.c | 9 +++++++++
libavcodec/version.h | 4 ++--
4 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index 3d25e01..3f6569d 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil: 2012-10-22
API changes, most recent first:
+2013-12-xx - xxxxxxx - lavc 55.29.0 - avcodec.h
+ Add HEVC profiles
+
2013-12-xx - xxxxxxx - lavc 55.28.1 - avcodec.h
av_frame_alloc(), av_frame_unref() and av_frame_free() now can and should be
used instead of avcodec_alloc_frame(), avcodec_get_frame_defaults() and
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 0e6ac05..9531c85 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2662,6 +2662,11 @@ typedef struct AVCodecContext {
#define FF_PROFILE_JPEG2000_DCINEMA_2K 3
#define FF_PROFILE_JPEG2000_DCINEMA_4K 4
+
+#define FF_PROFILE_HEVC_MAIN 1
+#define FF_PROFILE_HEVC_MAIN_10 2
+#define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3
+
/**
* level
* - encoding: Set by user.
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 4af5aee..229241b 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -3170,6 +3170,14 @@ static void hevc_decode_flush(AVCodecContext *avctx)
#define OFFSET(x) offsetof(HEVCContext, x)
#define PAR (AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM)
+
+static const AVProfile profiles[] = {
+ { FF_PROFILE_HEVC_MAIN, "Main" },
+ { FF_PROFILE_HEVC_MAIN_10, "Main 10" },
+ { FF_PROFILE_HEVC_MAIN_STILL_PICTURE, "Main Still Picture" },
+ { FF_PROFILE_UNKNOWN },
+};
+
static const AVOption options[] = {
{ "apply_defdispwin", "Apply default display window from VUI",
OFFSET(apply_defdispwin),
AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, PAR },
@@ -3198,4 +3206,5 @@ AVCodec ff_hevc_decoder = {
.init_thread_copy = hevc_init_thread_copy,
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY |
CODEC_CAP_FRAME_THREADS,
+ .profiles = NULL_IF_CONFIG_SMALL(profiles),
};
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 2c3f2f2..c5a777b 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -27,8 +27,8 @@
*/
#define LIBAVCODEC_VERSION_MAJOR 55
-#define LIBAVCODEC_VERSION_MINOR 28
-#define LIBAVCODEC_VERSION_MICRO 1
+#define LIBAVCODEC_VERSION_MINOR 29
+#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
--
1.8.3.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
