diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 22:59:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 23:43:05 +0200 |
| commit | b1fad7ac200d0779a44fc267085d7d46ce2391b9 (patch) | |
| tree | 8d90c6c835760252979c9739797993f71b36c603 /libavcodec/nvenc.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/nvenc.c')
| -rw-r--r-- | libavcodec/nvenc.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index a63c779d61..1f40086d28 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -563,12 +563,6 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx) if (!nvenc_dyload_nvenc(avctx)) return AVERROR_EXTERNAL; - avctx->coded_frame = av_frame_alloc(); - if (!avctx->coded_frame) { - res = AVERROR(ENOMEM); - goto error; - } - ctx->last_dts = AV_NOPTS_VALUE; ctx->encode_config.version = NV_ENC_CONFIG_VER; @@ -1051,8 +1045,6 @@ error: if (ctx->cu_context) dl_fn->cu_ctx_destroy(ctx->cu_context); - av_frame_free(&avctx->coded_frame); - nvenc_unload_nvenc(avctx); ctx->nvencoder = NULL; @@ -1086,8 +1078,6 @@ static av_cold int nvenc_encode_close(AVCodecContext *avctx) nvenc_unload_nvenc(avctx); - av_frame_free(&avctx->coded_frame); - return 0; } |