summaryrefslogtreecommitdiff
path: root/libavcodec/libxvid.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-20 22:59:45 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-20 23:43:05 +0200
commitb1fad7ac200d0779a44fc267085d7d46ce2391b9 (patch)
tree8d90c6c835760252979c9739797993f71b36c603 /libavcodec/libxvid.c
parent439c9760b046caaffceacc08c40692f2e8cb3f03 (diff)
parentd6604b29ef544793479d7fb4e05ef6622bb3e534 (diff)
downloadffmpeg-b1fad7ac200d0779a44fc267085d7d46ce2391b9.tar.gz
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/libxvid.c')
-rw-r--r--libavcodec/libxvid.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c
index e0e7cbd024..4574f380ba 100644
--- a/libavcodec/libxvid.c
+++ b/libavcodec/libxvid.c
@@ -680,9 +680,6 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx)
}
x->encoder_handle = xvid_enc_create.handle;
- avctx->coded_frame = av_frame_alloc();
- if (!avctx->coded_frame)
- return AVERROR(ENOMEM);
return 0;
}
@@ -818,7 +815,6 @@ static av_cold int xvid_encode_close(AVCodecContext *avctx)
x->encoder_handle = NULL;
}
- av_frame_free(&avctx->coded_frame);
av_freep(&avctx->extradata);
if (x->twopassbuffer) {
av_freep(&x->twopassbuffer);