From 21a561176e5ed44208a4438a1b0c28a91dd6f4b6 Mon Sep 17 00:00:00 2001 From: Derek Buitenhuis Date: Sun, 23 Mar 2014 14:31:06 +0000 Subject: [PATCH] libx265: Only use one memcpy for headers They're guaranteed by the x265 API to be contiguous in memory. Signed-off-by: Derek Buitenhuis --- libavcodec/libx265.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index b779c373c5..b12407030e 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -80,7 +80,6 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) { libx265Context *ctx = avctx->priv_data; x265_nal *nal; - uint8_t *buf; int sar_num, sar_den; int nnal; int ret; @@ -198,11 +197,7 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); } - buf = ctx->header; - for (i = 0; i < nnal; i++) { - memcpy(buf, nal[i].payload, nal[i].sizeBytes); - buf += nal[i].sizeBytes; - } + memcpy(ctx->header, nal[0].payload, ctx->header_size); if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) { avctx->extradata_size = ctx->header_size;