Merge commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 09:34:07 +0000 (11:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 09:34:07 +0000 (11:34 +0200)
* commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c':
  qdm2: Whitespace cosmetics
  flac: use meaningful return values

Conflicts:
libavcodec/flacdec.c

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

Simple merge
Simple merge
@@@ -828,9 -819,9 +828,9 @@@ static int synthfilt_build_sb_samples(Q
      if (length == 0) {
          // If no data use noise
          for (sb=sb_min; sb < sb_max; sb++)
-             build_sb_samples_from_noise (q, sb);
+             build_sb_samples_from_noise(q, sb);
  
 -        return;
 +        return 0;
      }
  
      for (sb = sb_min; sb < sb_max; sb++) {