diff options
| -rw-r--r-- | libavcodec/h264.c | 2 | ||||
| -rw-r--r-- | libavcodec/h264_cabac.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index a469306b4e..0c74a78931 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -578,7 +578,7 @@ static void hl_motion(H264Context *h, uint8_t *dest_y, uint8_t *dest_cb, uint8_t if(IS_16X16(mb_type)){ mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0, qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0], - &weight_op[0], &weight_avg[0], + weight_op, weight_avg, IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); }else if(IS_16X8(mb_type)){ mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0, diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 1375e9e4f7..9eceedbd7c 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -740,7 +740,7 @@ static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_sl return 0; /* I4x4 */ state += 2; }else{ - if( get_cabac_noinline( &h->cabac, &state[0] ) == 0 ) + if( get_cabac_noinline( &h->cabac, state ) == 0 ) return 0; /* I4x4 */ } |