ARM: use rX register names in simple_idct_armv6.S

[ffmpeg] / libavcodec / zmbv.c

diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index fd2a12048740f149f875ca7d8ffb5e1295ff7b04..6943ff3568470f05cc1d4e8764e1db053997e5c5 100644 (file)
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 #include <zlib.h>
@@ -505,7 +506,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const
         c->pic.key_frame = 0;
         c->pic.pict_type = FF_P_TYPE;
         if(c->decomp_len)
-        c->decode_xor(c);
+            c->decode_xor(c);
     }
 
     /* update frames */
@@ -589,7 +590,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const
  * 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
@@ -603,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));
@@ -638,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;
 
@@ -661,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"),
 };