Merge commit 'b16e9b9ac9db449cae2242767dd3c3fc309357c4'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 13:03:12 +0000 (15:03 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 13:03:12 +0000 (15:03 +0200)
* commit 'b16e9b9ac9db449cae2242767dd3c3fc309357c4':
  h264: move initialising the explicit pred weight table for MBAFF

Merged-by: Clément Bœsch <clement@stupeflix.com>
1  2 
libavcodec/h264_parse.c
libavcodec/h264_refs.c

@@@ -24,9 -24,9 +24,9 @@@
  
  int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps,
                                const int *ref_count, int slice_type_nos,
 -                              H264PredWeightTable *pwt)
 +                              H264PredWeightTable *pwt, void *logctx)
  {
-     int list, i;
+     int list, i, j;
      int luma_def, chroma_def;
  
      pwt->use_weight             = 0;
Simple merge