Update for 2.2-rc1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

RELEASE

@@ -1 +1 @@
-2.1.git
+2.2-rc1

VERSION

@@ -0,0 +1 @@
+2.2-rc1

doc/Doxyfile

@@ -31,7 +31,7 @@ PROJECT_NAME           = FFmpeg
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         =
+PROJECT_NUMBER         = 2.2-rc1
 
 # With the PROJECT_LOGO tag one can specify a logo or icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55

libavcodec/h264_ps.c

@@ -359,17 +359,11 @@ int ff_h264_decode_seq_parameter_set(H264Context *h)
     sps->scaling_matrix_present = 0;
     sps->colorspace = 2; //AVCOL_SPC_UNSPECIFIED
 
-    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
+    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) {
         sps->chroma_format_idc = get_ue_golomb_31(&h->gb);
         if (sps->chroma_format_idc > 3U) {
             avpriv_request_sample(h->avctx, "chroma_format_idc %u",