typo: occured --> occurred

[ffmpeg.git] / libavcodec / flashsv.c

diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c
index 9e4aa95..28579b7 100644 (file)
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@@ -50,7 +50,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 

-#include "common.h"

 #include "avcodec.h"
 #include "bitstream.h"
 
 #include "avcodec.h"
 #include "bitstream.h"
 


@@ -80,9 +79,9 @@ static void copy_region(uint8_t *sptr, uint8_t *dptr,
 }
 
 
 }
 
 

-static int flashsv_decode_init(AVCodecContext *avctx)
+static av_cold int flashsv_decode_init(AVCodecContext *avctx)

 {
 {

-    FlashSVContext *s = (FlashSVContext *)avctx->priv_data;
+    FlashSVContext *s = avctx->priv_data;

     int zret; // Zlib return code
 
     s->avctx = avctx;
     int zret; // Zlib return code
 
     s->avctx = avctx;


@@ -95,7 +94,6 @@ static int flashsv_decode_init(AVCodecContext *avctx)
         return 1;
     }
     avctx->pix_fmt = PIX_FMT_BGR24;
         return 1;
     }
     avctx->pix_fmt = PIX_FMT_BGR24;

-    avctx->has_b_frames = 0;

     s->frame.data[0] = NULL;
 
     return 0;
     s->frame.data[0] = NULL;
 
     return 0;


@@ -104,9 +102,9 @@ static int flashsv_decode_init(AVCodecContext *avctx)
 
 static int flashsv_decode_frame(AVCodecContext *avctx,
                                     void *data, int *data_size,
 
 static int flashsv_decode_frame(AVCodecContext *avctx,
                                     void *data, int *data_size,

-                                    uint8_t *buf, int buf_size)
+                                    const uint8_t *buf, int buf_size)

 {
 {

-    FlashSVContext *s = (FlashSVContext *)avctx->priv_data;
+    FlashSVContext *s = avctx->priv_data;

     int h_blocks, v_blocks, h_part, v_part, i, j;
     GetBitContext gb;
 
     int h_blocks, v_blocks, h_part, v_part, i, j;
     GetBitContext gb;
 


@@ -202,7 +200,7 @@ static int flashsv_decode_frame(AVCodecContext *avctx,
                 ret = inflate(&(s->zstream), Z_FINISH);
                 if (ret == Z_DATA_ERROR)
                 {
                 ret = inflate(&(s->zstream), Z_FINISH);
                 if (ret == Z_DATA_ERROR)
                 {

-                    av_log(avctx, AV_LOG_ERROR, "Zlib resync occured\n");
+                    av_log(avctx, AV_LOG_ERROR, "Zlib resync occurred\n");

                     inflateSync(&(s->zstream));
                     ret = inflate(&(s->zstream), Z_FINISH);
                 }
                     inflateSync(&(s->zstream));
                     ret = inflate(&(s->zstream), Z_FINISH);
                 }


@@ -230,9 +228,9 @@ static int flashsv_decode_frame(AVCodecContext *avctx,
 }
 
 
 }
 
 

-static int flashsv_decode_end(AVCodecContext *avctx)
+static av_cold int flashsv_decode_end(AVCodecContext *avctx)

 {
 {

-    FlashSVContext *s = (FlashSVContext *)avctx->priv_data;
+    FlashSVContext *s = avctx->priv_data;

     inflateEnd(&(s->zstream));
     /* release the frame if needed */
     if (s->frame.data[0])
     inflateEnd(&(s->zstream));
     /* release the frame if needed */
     if (s->frame.data[0])