diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 13:10:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 13:21:49 +0200 |
| commit | 490ed7f0eccfeba0685ac3148ef9047fd4d92de3 (patch) | |
| tree | ba04d8ff5822dbb49e37175cd953f21501572d67 /libavcodec/wmaprodec.c | |
| parent | 97947d9bba51bb3936a7907fde20c3b242c0d218 (diff) | |
| parent | d4a217a408da4bd63acc02cd8f9ebe378a2ad65a (diff) | |
| download | ffmpeg-490ed7f0eccfeba0685ac3148ef9047fd4d92de3.tar.gz | |
Merge commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a'
* commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a':
wmapro: check the min_samples_per_subframe
Conflicts:
libavcodec/wmaprodec.c
See: 9166f483c52e7e0a031a7bb149bea16aaa72f344
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmaprodec.c')
| -rw-r--r-- | libavcodec/wmaprodec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index de05a8b300..46accde81e 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -106,6 +106,7 @@ #define WMAPRO_BLOCK_MIN_BITS 6 ///< log2 of min block size #define WMAPRO_BLOCK_MAX_BITS 13 ///< log2 of max block size +#define WMAPRO_BLOCK_MIN_SIZE (1 << WMAPRO_BLOCK_MIN_BITS) ///< minimum block size #define WMAPRO_BLOCK_MAX_SIZE (1 << WMAPRO_BLOCK_MAX_BITS) ///< maximum block size #define WMAPRO_BLOCK_SIZES (WMAPRO_BLOCK_MAX_BITS - WMAPRO_BLOCK_MIN_BITS + 1) ///< possible block sizes @@ -336,7 +337,7 @@ static av_cold int decode_init(AVCodecContext *avctx) 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, "min_samples_per_subframe of %d too small\n", s->min_samples_per_subframe); return AVERROR_INVALIDDATA; |