Merge commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2' n2.3-dev
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 03:30:53 +0000 (04:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 03:30:57 +0000 (04:30 +0100)
* commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2':
  h264: add MVCD to the list of High profiles in SPS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264_ps.c

@@@ -357,15 -327,20 +357,21 @@@ int ff_h264_decode_seq_parameter_set(H2
      memset(sps->scaling_matrix4, 16, sizeof(sps->scaling_matrix4));
      memset(sps->scaling_matrix8, 16, sizeof(sps->scaling_matrix8));
      sps->scaling_matrix_present = 0;
 +    sps->colorspace = 2; //AVCOL_SPC_UNSPECIFIED
  
-     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) {
 +        if (sps->chroma_format_idc > 3U) {
              avpriv_request_sample(h->avctx, "chroma_format_idc %u",
                                    sps->chroma_format_idc);
              goto fail;