mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '2d097c16b833c532ac974a7f1fd05c0a1f3b7675'
* commit '2d097c16b833c532ac974a7f1fd05c0a1f3b7675': libopenh264enc: Return a more sensible error code in some init failure paths Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
commit
7e9474ca47
|
@ -167,6 +167,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
||||||
av_log(avctx, AV_LOG_ERROR,
|
av_log(avctx, AV_LOG_ERROR,
|
||||||
"Invalid combination -slices %d and -max_nal_size %d.\n",
|
"Invalid combination -slices %d and -max_nal_size %d.\n",
|
||||||
avctx->slices, s->max_nal_size);
|
avctx->slices, s->max_nal_size);
|
||||||
|
err = AVERROR(EINVAL);
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -195,6 +196,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
||||||
} else {
|
} else {
|
||||||
av_log(avctx, AV_LOG_ERROR, "Invalid -max_nal_size, "
|
av_log(avctx, AV_LOG_ERROR, "Invalid -max_nal_size, "
|
||||||
"specify a valid max_nal_size to use -slice_mode dyn\n");
|
"specify a valid max_nal_size to use -slice_mode dyn\n");
|
||||||
|
err = AVERROR(EINVAL);
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue