From 9b68538fddf6eaea119d907afdbfdb3b88ce5137 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 24 Jan 2014 03:25:47 +0100 Subject: avcodec/libopenjpegenc: Replace av_frame_alloc() and av_frame_ref() by av_frame_clone() Simplifies code Signed-off-by: Michael Niedermayer --- libavcodec/libopenjpegenc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'libavcodec/libopenjpegenc.c') diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index f113be38f9..083da64259 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -501,13 +501,9 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, case AV_PIX_FMT_GBRP12: case AV_PIX_FMT_GBRP14: case AV_PIX_FMT_GBRP16: - gbrframe = av_frame_alloc(); + gbrframe = av_frame_clone(frame); if (!gbrframe) return AVERROR(ENOMEM); - if ((ret = av_frame_ref(gbrframe, frame)) < 0) { - av_frame_free(&gbrframe); - return ret; - } gbrframe->data[0] = frame->data[2]; // swap to be rgb gbrframe->data[1] = frame->data[0]; gbrframe->data[2] = frame->data[1]; -- cgit v1.2.3