Merge commit 'a67f8ae9a2c8529bf6a635e8ca4e3483592708b1'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 14:57:21 +0000 (15:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 14:57:21 +0000 (15:57 +0100)
* commit 'a67f8ae9a2c8529bf6a635e8ca4e3483592708b1':
  h264: move mvd_table into the per-slice context

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_mvpred.h
libavcodec/h264_slice.c

@@@ -445,10 -422,13 +445,13 @@@ int ff_h264_alloc_tables(H264Context *h
                        big_mb_num * sizeof(uint16_t), fail)
      FF_ALLOCZ_OR_GOTO(h->avctx, h->chroma_pred_mode_table,
                        big_mb_num * sizeof(uint8_t), fail)
 -    FF_ALLOCZ_OR_GOTO(h->avctx, h->mvd_table[0],
 -                      16 * row_mb_num * sizeof(uint8_t), fail);
 -    FF_ALLOCZ_OR_GOTO(h->avctx, h->mvd_table[1],
 -                      16 * row_mb_num * sizeof(uint8_t), fail);
 +    FF_ALLOCZ_ARRAY_OR_GOTO(h->avctx, h->mvd_table[0],
 +                      row_mb_num, 16 * sizeof(uint8_t), fail);
 +    FF_ALLOCZ_ARRAY_OR_GOTO(h->avctx, h->mvd_table[1],
 +                      row_mb_num, 16 * sizeof(uint8_t), fail);
+     h->slice_ctx[0].mvd_table[0] = h->mvd_table[0];
+     h->slice_ctx[0].mvd_table[1] = h->mvd_table[1];
      FF_ALLOCZ_OR_GOTO(h->avctx, h->direct_table,
                        4 * big_mb_num * sizeof(uint8_t), fail);
      FF_ALLOCZ_OR_GOTO(h->avctx, h->list_counts,
Simple merge
Simple merge
Simple merge