[SCM] libav/experimental: libx265: Only set the SAR if it is valid
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:02:46 UTC 2014
The following commit has been merged in the experimental branch:
commit 25fbfeed98d2eaddda0885e0916a83085549bae6
Author: Derek Buitenhuis <derek.buitenhuis at gmail.com>
Date: Thu Apr 10 13:27:41 2014 +0100
libx265: Only set the SAR if it is valid
Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
index 223ec78..41b1cda 100644
--- a/libavcodec/libx265.c
+++ b/libavcodec/libx265.c
@@ -113,13 +113,15 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
ctx->params->sourceWidth = avctx->width;
ctx->params->sourceHeight = avctx->height;
- av_reduce(&sar_num, &sar_den,
- avctx->sample_aspect_ratio.num,
- avctx->sample_aspect_ratio.den, 65535);
- snprintf(sar, sizeof(sar), "%d:%d", sar_num, sar_den);
- if (x265_param_parse(ctx->params, "sar", sar) == X265_PARAM_BAD_VALUE) {
- av_log(avctx, AV_LOG_ERROR, "Invalid SAR: %d:%d.\n", sar_num, sar_den);
- return AVERROR_INVALIDDATA;
+ if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den > 0) {
+ av_reduce(&sar_num, &sar_den,
+ avctx->sample_aspect_ratio.num,
+ avctx->sample_aspect_ratio.den, 65535);
+ snprintf(sar, sizeof(sar), "%d:%d", sar_num, sar_den);
+ if (x265_param_parse(ctx->params, "sar", sar) == X265_PARAM_BAD_VALUE) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid SAR: %d:%d.\n", sar_num, sar_den);
+ return AVERROR_INVALIDDATA;
+ }
}
if (x265_max_bit_depth == 8)
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list