From 90f469aa2b98a868cdbe35170c24272de10e1341 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 14 May 2016 17:15:46 +0200 Subject: lavc: add H.264 MVC profiles --- doc/APIchanges | 3 +++ libavcodec/avcodec.h | 2 ++ libavcodec/profiles.c | 2 ++ libavcodec/version.h | 4 ++-- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 9f46edc15e..de0213f80e 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,9 @@ libavutil: 2015-08-28 API changes, most recent first: +2016-xx-xx - xxxxxxx - lavc 57.20.0 - avcodec.h + Add FF_PROFILE_H264_MULTIVIEW_HIGH and FF_PROFILE_H264_STEREO_HIGH. + 2016-xx-xx - xxxxxxx - lavu 55.13.0 - hwcontext.h Add av_hwdevice_ctx_create(). diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f33b7e5ac9..87a7a9d307 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2905,8 +2905,10 @@ typedef struct AVCodecContext { #define FF_PROFILE_H264_HIGH 100 #define FF_PROFILE_H264_HIGH_10 110 #define FF_PROFILE_H264_HIGH_10_INTRA (110|FF_PROFILE_H264_INTRA) +#define FF_PROFILE_H264_MULTIVIEW_HIGH 118 #define FF_PROFILE_H264_HIGH_422 122 #define FF_PROFILE_H264_HIGH_422_INTRA (122|FF_PROFILE_H264_INTRA) +#define FF_PROFILE_H264_STEREO_HIGH 128 #define FF_PROFILE_H264_HIGH_444 144 #define FF_PROFILE_H264_HIGH_444_PREDICTIVE 244 #define FF_PROFILE_H264_HIGH_444_INTRA (244|FF_PROFILE_H264_INTRA) diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c index c03106c8e1..d5c5df2e56 100644 --- a/libavcodec/profiles.c +++ b/libavcodec/profiles.c @@ -59,6 +59,8 @@ const AVProfile ff_h264_profiles[] = { { FF_PROFILE_H264_HIGH_444_PREDICTIVE, "High 4:4:4 Predictive" }, { FF_PROFILE_H264_HIGH_444_INTRA, "High 4:4:4 Intra" }, { FF_PROFILE_H264_CAVLC_444, "CAVLC 4:4:4" }, + { FF_PROFILE_H264_MULTIVIEW_HIGH, "Multiview High" }, + { FF_PROFILE_H264_STEREO_HIGH, "Stereo High" }, { FF_PROFILE_UNKNOWN }, }; diff --git a/libavcodec/version.h b/libavcodec/version.h index 4bfa09ca89..ad7e19d893 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 19 -#define LIBAVCODEC_VERSION_MICRO 1 +#define LIBAVCODEC_VERSION_MINOR 20 +#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ -- cgit v1.2.3