diff options
author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-07-15 18:41:20 +0100 |
---|---|---|
committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-07-20 14:16:15 +0100 |
commit | d6604b29ef544793479d7fb4e05ef6622bb3e534 (patch) | |
tree | 37d5559063e276f17da8036e4c08bb8aa4b05534 /libavcodec/libvpxenc.c | |
parent | 91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf (diff) | |
download | ffmpeg-d6604b29ef544793479d7fb4e05ef6622bb3e534.tar.gz |
Gather all coded_frame allocations and free functions to a single place
Allocating coded_frame is what most encoders do anyway, so it makes
sense to always allocate and free it in a single place. Moreover a lot
of encoders freed the frame with av_freep() instead of the correct API
av_frame_free().
This bring uniformity to encoder behaviour and prevents applications
from erroneusly accessing this field when not allocated. Additionally
this helps isolating encoders that export information with coded_frame,
and heavily simplifies its deprecation.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec/libvpxenc.c')
-rw-r--r-- | libavcodec/libvpxenc.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index e8c7327b33..20fd38c5d2 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -210,7 +210,6 @@ static av_cold int vp8_free(AVCodecContext *avctx) vpx_codec_destroy(&ctx->encoder); av_freep(&ctx->twopass_stats.buf); - av_freep(&avctx->coded_frame); av_freep(&avctx->stats_out); free_frame_list(ctx->coded_frame_list); return 0; @@ -371,12 +370,6 @@ static av_cold int vpx_init(AVCodecContext *avctx, vpx_img_wrap(&ctx->rawimg, ff_vpx_pixfmt_to_imgfmt(avctx->pix_fmt), avctx->width, avctx->height, 1, (unsigned char *)1); - avctx->coded_frame = av_frame_alloc(); - if (!avctx->coded_frame) { - av_log(avctx, AV_LOG_ERROR, "Error allocating coded frame\n"); - vp8_free(avctx); - return AVERROR(ENOMEM); - } return 0; } |