mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-01 22:16:42 +02:00
Merge commit '8dd0a2c5cf40a8a49faae985adc11750b6429132'
* commit '8dd0a2c5cf40a8a49faae985adc11750b6429132': libopusenc: prevent an out-of-bounds read by returning early Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
7b824e8b25
@ -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 +
|
||||||
|
Loading…
Reference in New Issue
Block a user