har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libx265: Reduce the scope of some variables

Browse Source 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2015-02-17 17:04:51 -05:00
parent b68d902b6e
commit b920db6731
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/libx265.c
View File

@ -76,10 +76,6 @@ static av_cold int libx265_encode_close(AVCodecContext *avctx)
static av_cold int libx265_encode_init(AVCodecContext *avctx) static av_cold int libx265_encode_init(AVCodecContext *avctx)
{ {
libx265Context *ctx = avctx->priv_data; 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 && if (avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL &&
!av_pix_fmt_desc_get(avctx->pix_fmt)->log2_chroma_w) { !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); ctx->params->bEnablePsnr = !!(avctx->flags & CODEC_FLAG_PSNR);
if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den > 0) { 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, av_reduce(&sar_num, &sar_den,
avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.num,
avctx->sample_aspect_ratio.den, 65535); 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) { if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) {
x265_nal *nal;
int nnal;
avctx->extradata_size = x265_encoder_headers(ctx->encoder, &nal, &nnal); avctx->extradata_size = x265_encoder_headers(ctx->encoder, &nal, &nnal);
if (avctx->extradata_size <= 0) { if (avctx->extradata_size <= 0) {
av_log(avctx, AV_LOG_ERROR, "Cannot encode headers.\n"); av_log(avctx, AV_LOG_ERROR, "Cannot encode headers.\n");