Use "!exp" instead of "exp == NULL" in if condition.

[ffmpeg] / libavcodec / lclenc.c

diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c
index 762b83e1b443df5300dace9d73ee9eb34633bd8e..4c43916fd195220484bee573cf8e83fb5d4059da 100644 (file)
--- a/libavcodec/lclenc.c
+++ b/libavcodec/lclenc.c
@@ -42,7 +42,6 @@
 #include <stdlib.h>
 
 #include "avcodec.h"
-#include "put_bits.h"
 #include "lcl.h"
 
 #include <zlib.h>
@@ -54,7 +53,6 @@ typedef struct LclEncContext {
 
     AVCodecContext *avctx;
     AVFrame pic;
-    PutBitContext pb;
 
     // Image type
     int imgtype;
@@ -62,12 +60,6 @@ typedef struct LclEncContext {
     int compression;
     // Flags
     int flags;
-    // Decompressed data size
-    unsigned int decomp_size;
-    // Maximum compressed data size
-    unsigned int max_comp_size;
-    // Compression buffer
-    unsigned char* comp_buf;
     z_stream zstream;
 } LclEncContext;
 
@@ -83,8 +75,6 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
     int i;
     int zret; // Zlib return code
 
-    init_put_bits(&c->pb, buf, buf_size);
-
     *p = *pict;
     p->pict_type= FF_I_TYPE;
     p->key_frame= 1;
@@ -99,8 +89,8 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
         av_log(avctx, AV_LOG_ERROR, "Deflate reset error: %d\n", zret);
         return -1;
     }
-    c->zstream.next_out = c->comp_buf;
-    c->zstream.avail_out = c->max_comp_size;
+    c->zstream.next_out = buf;
+    c->zstream.avail_out = buf_size;
 
     for(i = avctx->height - 1; i >= 0; i--) {
         c->zstream.next_in = p->data[0]+p->linesize[0]*i;
@@ -117,10 +107,6 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
         return -1;
     }
 
-    for (i = 0; i < c->zstream.total_out; i++)
-        put_bits(&c->pb, 8, c->comp_buf[i]);
-    flush_put_bits(&c->pb);
-
     return c->zstream.total_out;
 }
 
@@ -148,7 +134,6 @@ static av_cold int encode_init(AVCodecContext *avctx)
     switch(avctx->pix_fmt){
         case PIX_FMT_BGR24:
             c->imgtype = IMGTYPE_RGB24;
-            c->decomp_size = avctx->width * avctx->height * 3;
             avctx->bits_per_coded_sample= 24;
             break;
         default:
@@ -156,14 +141,14 @@ static av_cold int encode_init(AVCodecContext *avctx)
             return -1;
     }
 
-    ((uint8_t*)avctx->extradata)[0]= 4;
-    ((uint8_t*)avctx->extradata)[1]= 0;
-    ((uint8_t*)avctx->extradata)[2]= 0;
-    ((uint8_t*)avctx->extradata)[3]= 0;
-    ((uint8_t*)avctx->extradata)[4]= c->imgtype;
-    ((uint8_t*)avctx->extradata)[5]= c->compression;
-    ((uint8_t*)avctx->extradata)[6]= c->flags;
-    ((uint8_t*)avctx->extradata)[7]= CODEC_ZLIB;
+    avctx->extradata[0]= 4;
+    avctx->extradata[1]= 0;
+    avctx->extradata[2]= 0;
+    avctx->extradata[3]= 0;
+    avctx->extradata[4]= c->imgtype;
+    avctx->extradata[5]= c->compression;
+    avctx->extradata[6]= c->flags;
+    avctx->extradata[7]= CODEC_ZLIB;
     c->avctx->extradata_size= 8;
 
     c->zstream.zalloc = Z_NULL;
@@ -175,14 +160,6 @@ static av_cold int encode_init(AVCodecContext *avctx)
         return 1;
     }
 
-    /* Conservative upper bound taken from zlib v1.2.1 source */
-    c->max_comp_size = c->decomp_size + ((c->decomp_size + 7) >> 3) +
-                       ((c->decomp_size + 63) >> 6) + 11;
-    if ((c->comp_buf = av_malloc(c->max_comp_size)) == NULL) {
-        av_log(avctx, AV_LOG_ERROR, "Can't allocate compression buffer.\n");
-        return 1;
-    }
-
     return 0;
 }
 
@@ -196,7 +173,6 @@ static av_cold int encode_end(AVCodecContext *avctx)
     LclEncContext *c = avctx->priv_data;
 
     av_freep(&avctx->extradata);
-    av_freep(&c->comp_buf);
     deflateEnd(&c->zstream);
 
     return 0;