Commit 80ce23da authored by Mark Thompson's avatar Mark Thompson

vaapi_encode_h265: Reduce SAR to valid range

Matching previous commit for H.264.
parent a830056b
...@@ -472,18 +472,20 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) ...@@ -472,18 +472,20 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx)
{ 80, 33 }, { 18, 11 }, { 15, 11 }, { 64, 33 }, { 80, 33 }, { 18, 11 }, { 15, 11 }, { 64, 33 },
{ 160, 99 }, { 4, 3 }, { 3, 2 }, { 2, 1 }, { 160, 99 }, { 4, 3 }, { 3, 2 }, { 2, 1 },
}; };
int i; int num, den, i;
av_reduce(&num, &den, avctx->sample_aspect_ratio.num,
avctx->sample_aspect_ratio.den, 65535);
for (i = 0; i < FF_ARRAY_ELEMS(sar_idc); i++) { for (i = 0; i < FF_ARRAY_ELEMS(sar_idc); i++) {
if (avctx->sample_aspect_ratio.num == sar_idc[i].num && if (num == sar_idc[i].num &&
avctx->sample_aspect_ratio.den == sar_idc[i].den) { den == sar_idc[i].den) {
vui->aspect_ratio_idc = i; vui->aspect_ratio_idc = i;
break; break;
} }
} }
if (i >= FF_ARRAY_ELEMS(sar_idc)) { if (i >= FF_ARRAY_ELEMS(sar_idc)) {
vui->aspect_ratio_idc = 255; vui->aspect_ratio_idc = 255;
vui->sar_width = avctx->sample_aspect_ratio.num; vui->sar_width = num;
vui->sar_height = avctx->sample_aspect_ratio.den; vui->sar_height = den;
} }
vui->aspect_ratio_info_present_flag = 1; vui->aspect_ratio_info_present_flag = 1;
} }
......
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