diff options
| author | Clément Bœsch <[email protected]> | 2016-07-09 14:01:28 +0200 |
|---|---|---|
| committer | Clément Bœsch <[email protected]> | 2016-07-09 14:01:28 +0200 |
| commit | 775389fc59bc46ac00babc1baf35e273e65f8541 (patch) | |
| tree | e40d07a52ef4f95bddb26300e22c0d80fbd0406f /libavcodec/avcodec.h | |
| parent | f512e4a39037ef798ec78170f734c7733abe3231 (diff) | |
| parent | 90f469aa2b98a868cdbe35170c24272de10e1341 (diff) | |
Merge commit '90f469aa2b98a868cdbe35170c24272de10e1341'
* commit '90f469aa2b98a868cdbe35170c24272de10e1341':
lavc: add H.264 MVC profiles
Merged-by: Clément Bœsch <[email protected]>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
1 files changed, 2 insertions, 0 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) |