WMA: extend exponent range to 95

[frescor/ffmpeg.git] / libavcodec / rv34.c

diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index 821a7f67b55e1c5542e2beb76bec0a59bb10b68b..50ded799779f7260873368117d90113f9fc00701 100644 (file)
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -37,9 +37,11 @@
 
 //#define DEBUG
 
-#define ZERO8x2(dst, stride) \
-    fill_rectangle(dst,                 1, 2, stride, 0, 4); \
-    fill_rectangle(((uint8_t*)(dst))+4, 1, 2, stride, 0, 4); \
+static inline void ZERO8x2(void* dst, int stride)
+{
+    fill_rectangle(dst,                 1, 2, stride, 0, 4);
+    fill_rectangle(((uint8_t*)(dst))+4, 1, 2, stride, 0, 4);
+}
 
 /** translation of RV30/40 macroblock types to lavc ones */
 static const int rv34_mb_type_to_lavc[12] = {
@@ -1285,6 +1287,7 @@ static int rv34_decode_slice(RV34DecContext *r, int end, const uint8_t* buf, int
             MPV_common_end(s);
             s->width  = r->si.width;
             s->height = r->si.height;
+            avcodec_set_dimensions(s->avctx, s->width, s->height);
             if(MPV_common_init(s) < 0)
                 return -1;
             r->intra_types_stride = s->mb_width*4 + 4;