diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 23:59:45 +0300 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 00:43:05 +0300 |
commit | b1fad7ac200d0779a44fc267085d7d46ce2391b9 (patch) | |
tree | 8d90c6c835760252979c9739797993f71b36c603 /libavcodec/libopenjpegenc.c | |
parent | 439c9760b046caaffceacc08c40692f2e8cb3f03 (diff) | |
parent | d6604b29ef544793479d7fb4e05ef6622bb3e534 (diff) |
Merge commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534'
* commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534':
Gather all coded_frame allocations and free functions to a single place
Conflicts:
libavcodec/a64multienc.c
libavcodec/asvenc.c
libavcodec/cljrenc.c
libavcodec/dpxenc.c
libavcodec/dvenc.c
libavcodec/gif.c
libavcodec/huffyuvenc.c
libavcodec/jpeglsenc.c
libavcodec/libopenjpegenc.c
libavcodec/libtheoraenc.c
libavcodec/libvpxenc.c
libavcodec/mpegvideo_enc.c
libavcodec/nvenc.c
libavcodec/pngenc.c
libavcodec/proresenc_kostya.c
libavcodec/sunrastenc.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/utvideoenc.c
libavcodec/v210enc.c
libavcodec/v410enc.c
libavcodec/xbmenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/libopenjpegenc.c')
-rw-r--r-- | libavcodec/libopenjpegenc.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index 014c2f9d28..f48e55e164 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -242,18 +242,11 @@ static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx) goto fail; } - avctx->coded_frame = av_frame_alloc(); - if (!avctx->coded_frame) { - av_log(avctx, AV_LOG_ERROR, "Error allocating coded frame\n"); - goto fail; - } - return 0; fail: opj_image_destroy(ctx->image); ctx->image = NULL; - av_frame_free(&avctx->coded_frame); return err; } @@ -608,7 +601,6 @@ static av_cold int libopenjpeg_encode_close(AVCodecContext *avctx) opj_image_destroy(ctx->image); ctx->image = NULL; - av_frame_free(&avctx->coded_frame); return 0; } |