virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-24 17:12:34 +02:00
Code Issues Releases Activity

Merge commit '8dd0a2c5cf40a8a49faae985adc11750b6429132'

Browse Source 
* commit '8dd0a2c5cf40a8a49faae985adc11750b6429132':
  libopusenc: prevent an out-of-bounds read by returning early

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-13 12:12:16 +01:00
commit 7b824e8b25
1 changed files with 4 additions and 3 deletions

7
libavcodec/libopusenc.c

@ -170,10 +170,11 @@ static av_cold int libopus_encode_init(AVCodecContext *avctx)
/* FIXME: Opus can handle up to 255 channels. However, the mapping for /* FIXME: Opus can handle up to 255 channels. However, the mapping for
* anything greater than 8 is undefined. */ * anything greater than 8 is undefined. */
if (avctx->channels > 8) if (avctx->channels > 8) {
av_log(avctx, AV_LOG_WARNING, av_log(avctx, AV_LOG_ERROR,
"Channel layout undefined for %d channels.\n", avctx->channels); "Channel layout undefined for %d channels.\n", avctx->channels);
return AVERROR_PATCHWELCOME;
}
if (!avctx->bit_rate) { if (!avctx->bit_rate) {
/* Sane default copied from opusenc */ /* Sane default copied from opusenc */
avctx->bit_rate = 64000 * opus->stream_count + avctx->bit_rate = 64000 * opus->stream_count +