Merge commit 'b97f6ef956293fe06ae1e99bd295f42613081f37'

* commit 'b97f6ef956293fe06ae1e99bd295f42613081f37':
  pcm-dvd: Move a variable to a smaller scope

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

diff --cc libavcodec/pcm-dvd.c
index 9b4c40e,f68af36..e4184a5
--- 1/libavcodec/pcm-dvd.c
--- 2/libavcodec/pcm-dvd.c
+++ b/libavcodec/pcm-dvd.c
@@@ -173,18 -168,8 +172,19 @@@ static void *pcm_dvd_decode_samples(AVC
          } while (--samples);
  #endif
          return dst16;
+     }
      case 20:
 +        if (avctx->channels == 1) {
 +            do {
 +                for (i = 2; i; i--) {
 +                    dst32[0] = bytestream2_get_be16u(&gb) << 16;
 +                    dst32[1] = bytestream2_get_be16u(&gb) << 16;
 +                    t = bytestream2_get_byteu(&gb);
 +                    *dst32++ += (t & 0xf0) << 8;
 +                    *dst32++ += (t & 0x0f) << 12;
 +                }
 +            } while (--blocks);
 +        } else {
          do {
              for (i = s->groups_per_block; i; i--) {
                  dst32[0] = bytestream2_get_be16u(&gb) << 16;