summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-18 14:40:11 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-18 14:40:11 +0200
commit7b1c03aa744f1f82fe30ea2cd2aeef2ea01d5ce9 (patch)
tree40653fc95b6a3ff82d552dab2bed47d1ca55a9d1 /libavcodec
parent98eb1ac901276c1f348ad52f9eea8f11d66b511c (diff)
avcodec/libx264: Avoid reconfig on equivalent aspect ratios
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/libx264.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 220d43e1d8..4f34d065a5 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -170,8 +170,7 @@ static void reconfig_encoder(AVCodecContext *ctx, const AVFrame *frame)
x4->params.b_tff = frame->top_field_first;
x264_encoder_reconfig(x4->enc, &x4->params);
}
- if (x4->params.vui.i_sar_height != ctx->sample_aspect_ratio.den ||
- x4->params.vui.i_sar_width != ctx->sample_aspect_ratio.num) {
+ if (x4->params.vui.i_sar_height*ctx->sample_aspect_ratio.num != ctx->sample_aspect_ratio.den * x4->params.vui.i_sar_width) {
x4->params.vui.i_sar_height = ctx->sample_aspect_ratio.den;
x4->params.vui.i_sar_width = ctx->sample_aspect_ratio.num;
x264_encoder_reconfig(x4->enc, &x4->params);