Add rule for building API example programs.

[ffmpeg] / libavcodec / zmbv.c

diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index 76d8b654a30c3631e5e685cb1b0d0cacb1d25ad3..33c1087e2d88bbf6e1838f99ea45361df825c4ab 100644 (file)
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -20,13 +20,14 @@
  */
 
 /**
- * @file zmbv.c
+ * @file libavcodec/zmbv.c
  * Zip Motion Blocks Video decoder
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 #include <zlib.h>
@@ -391,7 +392,7 @@ static int zmbv_decode_intra(ZmbvContext *c)
     return 0;
 }
 
-static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)
+static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size)
 {
     ZmbvContext * const c = avctx->priv_data;
     uint8_t *outptr;
@@ -504,7 +505,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
     } else {
         c->pic.key_frame = 0;
         c->pic.pict_type = FF_P_TYPE;
-        c->decode_xor(c);
+        if(c->decomp_len)
+            c->decode_xor(c);
     }
 
     /* update frames */
@@ -588,7 +590,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
  * Init zmbv decoder
  *
  */
-static int decode_init(AVCodecContext *avctx)
+static av_cold int decode_init(AVCodecContext *avctx)
 {
     ZmbvContext * const c = avctx->priv_data;
     int zret; // Zlib return code
@@ -602,7 +604,7 @@ static int decode_init(AVCodecContext *avctx)
     if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) {
         return 1;
     }
-    c->bpp = avctx->bits_per_sample;
+    c->bpp = avctx->bits_per_coded_sample;
 
     // Needed if zlib unused or init aborted before inflateInit
     memset(&(c->zstream), 0, sizeof(z_stream));
@@ -637,7 +639,7 @@ static int decode_init(AVCodecContext *avctx)
  * Uninit zmbv decoder
  *
  */
-static int decode_end(AVCodecContext *avctx)
+static av_cold int decode_end(AVCodecContext *avctx)
 {
     ZmbvContext * const c = avctx->priv_data;
 
@@ -660,6 +662,7 @@ AVCodec zmbv_decoder = {
     decode_init,
     NULL,
     decode_end,
-    decode_frame
+    decode_frame,
+    .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"),
 };