[SCM] libav/experimental: h264: add MVCD to the list of High profiles in SPS

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e70ab7c1f5005041bba0e4efc1165410f83495b2
Author: Vittorio Giovara <vittorio.giovara at gmail.com>
Date:   Mon Feb 17 13:55:15 2014 +0100

    h264: add MVCD to the list of High profiles in SPS
    
    Also comment all previous profiles.

diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 459bccc..cc80f35 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -328,11 +328,17 @@ int ff_h264_decode_seq_parameter_set(H264Context *h)
     memset(sps->scaling_matrix8, 16, sizeof(sps->scaling_matrix8));
     sps->scaling_matrix_present = 0;
 
-    if (sps->profile_idc == 100 || sps->profile_idc == 110 ||
-        sps->profile_idc == 122 || sps->profile_idc == 244 ||
-        sps->profile_idc ==  44 || sps->profile_idc ==  83 ||
-        sps->profile_idc ==  86 || sps->profile_idc == 118 ||
-        sps->profile_idc == 128 || sps->profile_idc == 144) {
+    if (sps->profile_idc == 100 ||  // High profile
+        sps->profile_idc == 110 ||  // High10 profile
+        sps->profile_idc == 122 ||  // High422 profile
+        sps->profile_idc == 244 ||  // High444 Predictive profile
+        sps->profile_idc ==  44 ||  // Cavlc444 profile
+        sps->profile_idc ==  83 ||  // Scalable Constrained High profile (SVC)
+        sps->profile_idc ==  86 ||  // Scalable High Intra profile (SVC)
+        sps->profile_idc == 118 ||  // Stereo High profile (MVC)
+        sps->profile_idc == 128 ||  // Multiview High profile (MVC)
+        sps->profile_idc == 138 ||  // Multiview Depth High profile (MVCD)
+        sps->profile_idc == 144) {  // old High444 profile
         sps->chroma_format_idc = get_ue_golomb_31(&h->gb);
         if (sps->chroma_format_idc > 3) {
             avpriv_request_sample(h->avctx, "chroma_format_idc %u",

-- 
Libav/FFmpeg packaging