diff options
| author | Clément Bœsch <u@pkh.me> | 2016-07-09 14:01:28 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-07-09 14:01:28 +0200 |
| commit | 775389fc59bc46ac00babc1baf35e273e65f8541 (patch) | |
| tree | e40d07a52ef4f95bddb26300e22c0d80fbd0406f /libavcodec | |
| parent | f512e4a39037ef798ec78170f734c7733abe3231 (diff) | |
| parent | 90f469aa2b98a868cdbe35170c24272de10e1341 (diff) | |
| download | ffmpeg-775389fc59bc46ac00babc1baf35e273e65f8541.tar.gz | |
Merge commit '90f469aa2b98a868cdbe35170c24272de10e1341'
* commit '90f469aa2b98a868cdbe35170c24272de10e1341':
lavc: add H.264 MVC profiles
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/profiles.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 39713ed76b..6a7dc3d56f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3189,8 +3189,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 da745e1399..0984704ebd 100644 --- a/libavcodec/profiles.c +++ b/libavcodec/profiles.c @@ -60,6 +60,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 71c85db93f..f588316000 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 49 -#define LIBAVCODEC_VERSION_MICRO 103 +#define LIBAVCODEC_VERSION_MINOR 50 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |