Merge commit 'd78fd2fa21cde28465e40dd0be4446b1387d22a6'

[ffmpeg] / libavcodec / profiles.c

diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c
index da745e13998dfce69c2e4cf4229c69cddd6a5bdd..0984704ebd9be01eb6583a95ca2da15fd05b2a6c 100644 (file)
--- 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 },
 };