sbr_hf_calc_npatches(), sbr.h: Increase the maximum number of patches to 6

The maximum number of patches according to the spec is 5. However the
Coding Technologies decoder check packages uses 6.

http://samples.mplayerhq.hu/A-codecs/AAC/aacPlusDecoderCheckPackage_v2.1/

Author: aconverse

libavcodec/aacsbr.c

@@ -542,7 +542,9 @@ static int sbr_hf_calc_npatches(AACContext *ac, SpectralBandReplication *sbr)
     if (sbr->patch_num_subbands[sbr->num_patches-1] < 3 && sbr->num_patches > 1)
         sbr->num_patches--;
 
-    if (sbr->num_patches > 5) { // Requirements (14496-3 sp04 p205)
+    // Requirements (14496-3 sp04 p205) sets the maximum number of patches to 5
+    // However the Coding Technologies decoder check uses 6 patches
+    if (sbr->num_patches > 6) {
         av_log(ac->avccontext, AV_LOG_ERROR, "Too many patches: %d\n", sbr->num_patches);
         return -1;
     }

libavcodec/sbr.h

@@ -133,8 +133,8 @@ typedef struct {
     uint16_t           f_tablenoise[6];
     uint16_t           f_tablelim[29];
     uint8_t            num_patches;
-    uint8_t            patch_num_subbands[5];
-    uint8_t            patch_start_subband[5];
+    uint8_t            patch_num_subbands[6];
+    uint8_t            patch_start_subband[6];
     float              X_low[32][40][2];
     float              X_high[64][40][2];
     DECLARE_ALIGNED(16, float, X)[2][32][64];