Commit cdd21f1f authored by Derek Buitenhuis's avatar Derek Buitenhuis

libx265: Only set the SAR if it is valid

Signed-off-by: 's avatarDerek Buitenhuis <derek.buitenhuis@gmail.com>
parent fcc43e02
...@@ -113,13 +113,15 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) ...@@ -113,13 +113,15 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
ctx->params->sourceWidth = avctx->width; ctx->params->sourceWidth = avctx->width;
ctx->params->sourceHeight = avctx->height; ctx->params->sourceHeight = avctx->height;
av_reduce(&sar_num, &sar_den, if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den > 0) {
avctx->sample_aspect_ratio.num, av_reduce(&sar_num, &sar_den,
avctx->sample_aspect_ratio.den, 65535); avctx->sample_aspect_ratio.num,
snprintf(sar, sizeof(sar), "%d:%d", sar_num, sar_den); avctx->sample_aspect_ratio.den, 65535);
if (x265_param_parse(ctx->params, "sar", sar) == X265_PARAM_BAD_VALUE) { snprintf(sar, sizeof(sar), "%d:%d", sar_num, sar_den);
av_log(avctx, AV_LOG_ERROR, "Invalid SAR: %d:%d.\n", sar_num, sar_den); if (x265_param_parse(ctx->params, "sar", sar) == X265_PARAM_BAD_VALUE) {
return AVERROR_INVALIDDATA; av_log(avctx, AV_LOG_ERROR, "Invalid SAR: %d:%d.\n", sar_num, sar_den);
return AVERROR_INVALIDDATA;
}
} }
if (x265_max_bit_depth == 8) if (x265_max_bit_depth == 8)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment