aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2014-03-23 14:31:06 +0000
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2014-03-24 15:28:20 +0000
commitecb5b9c098009787e02f6de9e2d3e1786531c2f2 (patch)
treef3323264660887e45dfee3249329d6a39ca639c7
parent206d5330f64843a6e944c8e98402a6a876b8ef45 (diff)
downloadffmpeg-ecb5b9c098009787e02f6de9e2d3e1786531c2f2.tar.gz
libx265: Only use one memcpy for headers
They're guaranteed by the x265 API to be contiguous in memory. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
-rw-r--r--libavcodec/libx265.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
index fbce99cf83..15a0535d08 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;