[FFmpeg-cvslog] avcodec/cljr: remove coded_frame code

Michael Niedermayer git at videolan.org
Sun Jun 1 01:35:20 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 31 22:19:13 2014 +0200| [59a70422b1bba8b413c0f13d2489f3fac41e6413] | committer: Michael Niedermayer

avcodec/cljr: remove coded_frame code

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=59a70422b1bba8b413c0f13d2489f3fac41e6413
---

 libavcodec/cljr.c |   20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c
index 7e0773b..9b2bf60 100644
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@ -102,21 +102,6 @@ typedef struct CLJRContext {
     int             dither_type;
 } CLJRContext;
 
-static av_cold int encode_init(AVCodecContext *avctx)
-{
-    avctx->coded_frame = av_frame_alloc();
-    if (!avctx->coded_frame)
-        return AVERROR(ENOMEM);
-
-    return 0;
-}
-
-static av_cold int encode_close(AVCodecContext *avctx)
-{
-    av_frame_free(&avctx->coded_frame);
-    return 0;
-}
-
 static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
                         const AVFrame *p, int *got_packet)
 {
@@ -133,9 +118,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     if ((ret = ff_alloc_packet2(avctx, pkt, 32*avctx->height*avctx->width/4)) < 0)
         return ret;
 
-    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
-    avctx->coded_frame->key_frame = 1;
-
     init_put_bits(&pb, pkt->data, pkt->size);
 
     for (y = 0; y < avctx->height; y++) {
@@ -186,9 +168,7 @@ AVCodec ff_cljr_encoder = {
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_CLJR,
     .priv_data_size = sizeof(CLJRContext),
-    .init           = encode_init,
     .encode2        = encode_frame,
-    .close          = encode_close,
     .pix_fmts       = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV411P,
                                                    AV_PIX_FMT_NONE },
     .priv_class     = &cljr_class,



More information about the ffmpeg-cvslog mailing list