Fix crash in interlaced with >8 refs

Crash introduced in weightp.

diff --git a/common/common.h b/common/common.h
index eab28e18403ae3d8b75840e39a98b9f5d0c84f47..0ba8fb984d8d79f7141559c85cb9d073a748c325 100644 (file)
--- a/common/common.h
+++ b/common/common.h
@@ -256,7 +256,7 @@ typedef struct
     } ref_pic_list_order[2][16];
 
     /* P-frame weighting */
-    x264_weight_t weight[16][3];
+    x264_weight_t weight[32][3];
 
     int i_mmco_remove_from_end;
     int i_mmco_command_count;

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 8f72e3f6b0adc96728d3401136959296d2f28059..7c20ff392c8091646bf71532e4a28adfe7ab5ddc 100644 (file)
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -1202,7 +1202,7 @@ static void x264_weighted_pred_init( x264_t *h )
     // and duplicates of that frame.
     h->fenc->i_lines_weighted = 0;
 
-    for( i_ref = 0; i_ref < h->i_ref0; i_ref++ )
+    for( i_ref = 0; i_ref < (h->i_ref0 << h->sh.b_mbaff); i_ref++ )
         for( i = 0; i < 3; i++ )
             h->sh.weight[i_ref][i].weightfn = NULL;