From: "Ronald S. Bultje" <[email protected]>
This fixes the compiler error "cannot convert from 'BlockNode' to
'int16_t'".
---
libavcodec/snowenc.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index f732820..6917050 100644
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -1005,10 +1005,15 @@ static av_always_inline int
check_block_inter(SnowContext *s, int mb_x, int mb_y
static av_always_inline int check_4block_inter(SnowContext *s, int mb_x, int
mb_y, int p0, int p1, int ref, int *best_rd){
const int b_stride= s->b_width << s->block_max_depth;
BlockNode *block= &s->block[mb_x + mb_y * b_stride];
- BlockNode backup[4]= {block[0], block[1], block[b_stride],
block[b_stride+1]};
+ BlockNode backup[4];
unsigned value;
int rd, index;
+ backup[0] = block[0];
+ backup[1] = block[1];
+ backup[2] = block[b_stride];
+ backup[3] = block[b_stride + 1];
+
assert(mb_x>=0 && mb_y>=0);
assert(mb_x<b_stride);
assert(((mb_x|mb_y)&1) == 0);
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
