Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jul 2013 13:47:50 +0000 (15:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jul 2013 14:00:57 +0000 (16:00 +0200)
* qatar/master:
  qdm2: Conceal broken samples

See: 5ee008e01d5a50d976b5f2a4abd6932185672d91

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

@@@ -853,7 -843,11 +851,12 @@@ static int synthfilt_build_sb_samples(Q
                  if (q->coding_method[1][sb][j] > q->coding_method[0][sb][j])
                      q->coding_method[0][sb][j] = q->coding_method[1][sb][j];
  
-             fix_coding_method_array(sb, q->nb_channels, q->coding_method);
+             if (fix_coding_method_array(sb, q->nb_channels,
+                                             q->coding_method)) {
++                av_log(NULL, AV_LOG_ERROR, "coding method invalid\n");
+                 build_sb_samples_from_noise(q, sb);
+                 continue;
+             }
              channels = 1;
          }