diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-01 22:12:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-01 22:43:09 +0200 |
| commit | 5eb353e0cd62ad212634c14e4b863554c0bc6161 (patch) | |
| tree | 0f53c933b7a61bf14553c3ab8abb8226bd9c23bb /libavcodec/wma.c | |
| parent | 23eeffcd48a15e73fb2649b712870b6d101c5471 (diff) | |
| parent | 3893feeccdf754057fc7c7ac711ae876733f2f33 (diff) | |
| download | ffmpeg-5eb353e0cd62ad212634c14e4b863554c0bc6161.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
opt/eval: Include mathematics.h for NAN/INFINITY
mathematics: Don't use division by zero in NAN/INFINITY macros
wma: Lower the maximum number of channels to 2
x86: cpu: clean up check for cpuid instruction support
ARM: generate position independent code to access data symbols
Conflicts:
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wma.c')
| -rw-r--r-- | libavcodec/wma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wma.c b/libavcodec/wma.c index 1ff18e8be3..7c8aa3070f 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -78,7 +78,7 @@ int ff_wma_init(AVCodecContext *avctx, int flags2) int coef_vlc_table; if ( avctx->sample_rate <= 0 || avctx->sample_rate > 50000 - || avctx->channels <= 0 || avctx->channels > 8 + || avctx->channels <= 0 || avctx->channels > 2 || avctx->bit_rate <= 0) return -1; |