diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2014-04-08 18:44:53 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2014-04-10 13:08:01 +0100 |
| commit | 8945dcbb52b6b87e1e6479912cce89c7da54ec43 (patch) | |
| tree | 5c4e2b7a36431b7a4534b01049c4e9d2fbcecc32 /libavcodec | |
| parent | e1c48e3593fb2e848fd7fb910ea3d807941f8e91 (diff) | |
| download | ffmpeg-8945dcbb52b6b87e1e6479912cce89c7da54ec43.tar.gz | |
libx265: Use x265_param_parse to set the SAR
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libx265.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 1788f657b9..e9e059b7d5 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -77,6 +77,7 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) { libx265Context *ctx = avctx->priv_data; x265_nal *nal; + char sar[10]; int sar_num, sar_den; int nnal; @@ -115,11 +116,11 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) av_reduce(&sar_num, &sar_den, avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den, 4096); - ctx->params->vui.bEnableVuiParametersPresentFlag = 1; - ctx->params->vui.bEnableAspectRatioIdc = 1; - ctx->params->vui.aspectRatioIdc = 255; - ctx->params->vui.sarWidth = sar_num; - ctx->params->vui.sarHeight = sar_den; + 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) ctx->params->internalBitDepth = 8; |