Merge commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jun 2013 11:10:33 +0000 (13:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jun 2013 11:21:49 +0000 (13:21 +0200)
* commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a':
  wmapro: check the min_samples_per_subframe

Conflicts:
libavcodec/wmaprodec.c

See: 9166f483c52e7e0a031a7bb149bea16aaa72f344

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

@@@ -336,9 -337,9 +337,9 @@@ static av_cold int decode_init(AVCodecC
          return AVERROR_INVALIDDATA;
      }
  
-     if (s->min_samples_per_subframe < (1<<WMAPRO_BLOCK_MIN_BITS)) {
+     if (s->min_samples_per_subframe < WMAPRO_BLOCK_MIN_SIZE) {
 -        av_log(avctx, AV_LOG_ERROR, "Invalid minimum block size %i\n",
 -               s->max_num_subframes);
 +        av_log(avctx, AV_LOG_ERROR, "min_samples_per_subframe of %d too small\n",
 +               s->min_samples_per_subframe);
          return AVERROR_INVALIDDATA;
      }