x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-11 12:19:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '79d89cf2f4b62eeb653fd8139041c87e75f7ca65'

Browse Source 
* commit '79d89cf2f4b62eeb653fd8139041c87e75f7ca65':
  flacenc: Clamp user-supplied min/max prediction orders

  Conflicts:
      libavcodec/flacenc.c

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis
2015-11-22 17:10:42 +00:00
parent bba2488f07 79d89cf2f4
commit 5ebaf1e1cb
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/flacenc.c
+8 -6
View File
@@ -340,9 +340,10 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
} else if (avctx->min_prediction_order >= 0) {
if (s->options.lpc_type == FF_LPC_TYPE_FIXED) {
if (avctx->min_prediction_order > MAX_FIXED_ORDER) {
av_log(avctx, AV_LOG_ERROR, "invalid min prediction order: %d\n",
avctx->min_prediction_order);
return AVERROR(EINVAL);
av_log(avctx, AV_LOG_WARNING,
"invalid min prediction order %d, clamped to %d\n",
avctx->min_prediction_order, MAX_FIXED_ORDER);
avctx->min_prediction_order = MAX_FIXED_ORDER;
}
} else if (avctx->min_prediction_order < MIN_LPC_ORDER ||
avctx->min_prediction_order > MAX_LPC_ORDER) {
@@ -357,9 +358,10 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
} else if (avctx->max_prediction_order >= 0) {
if (s->options.lpc_type == FF_LPC_TYPE_FIXED) {
if (avctx->max_prediction_order > MAX_FIXED_ORDER) {
av_log(avctx, AV_LOG_ERROR, "invalid max prediction order: %d\n",
avctx->max_prediction_order);
return AVERROR(EINVAL);
av_log(avctx, AV_LOG_WARNING,
"invalid max prediction order %d, clamped to %d\n",
avctx->max_prediction_order, MAX_FIXED_ORDER);
avctx->max_prediction_order = MAX_FIXED_ORDER;
}
} else if (avctx->max_prediction_order < MIN_LPC_ORDER ||
avctx->max_prediction_order > MAX_LPC_ORDER) {