From 2de887e45b664f44b51686f5979fa8ce6dfe2ec2 Mon Sep 17 00:00:00 2001 From: Derek Buitenhuis Date: Tue, 17 Feb 2015 17:04:51 -0500 Subject: libx265: Reduce the scope of some variables Signed-off-by: Derek Buitenhuis --- libavcodec/libx265.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'libavcodec/libx265.c') diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index e6931bdf80..8d83643584 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -76,10 +76,6 @@ static av_cold int libx265_encode_close(AVCodecContext *avctx) static av_cold int libx265_encode_init(AVCodecContext *avctx) { libx265Context *ctx = avctx->priv_data; - x265_nal *nal; - char sar[12]; - int sar_num, sar_den; - int nnal; if (avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL && !av_pix_fmt_desc_get(avctx->pix_fmt)->log2_chroma_w) { @@ -114,6 +110,9 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) ctx->params->bEnablePsnr = !!(avctx->flags & CODEC_FLAG_PSNR); if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den > 0) { + char sar[12]; + int sar_num, sar_den; + av_reduce(&sar_num, &sar_den, avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den, 65535); @@ -180,6 +179,9 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) } if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) { + x265_nal *nal; + int nnal; + avctx->extradata_size = x265_encoder_headers(ctx->encoder, &nal, &nnal); if (avctx->extradata_size <= 0) { av_log(avctx, AV_LOG_ERROR, "Cannot encode headers.\n"); -- cgit v1.2.3