Merge commit '6dd996c7c81575a1e4969987ab175a6df7beab3d'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 15:42:06 +0000 (17:42 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 15:42:06 +0000 (17:42 +0200)
* commit '6dd996c7c81575a1e4969987ab175a6df7beab3d':
  h264: move building the reference list out of h264_slice_header_parse()

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

@@@ -1696,9 -1443,13 +1693,13 @@@ int ff_h264_decode_slice_header(H264Con
      int i, j, ret = 0;
  
      ret = h264_slice_header_parse(h, sl);
 -    if (ret < 0)
 +    if (ret) // can not be ret<0 because of SLICE_SKIPED, SLICE_SINGLETHREAD, ...
          return ret;
  
+     ret = ff_h264_build_ref_list(h, sl);
+     if (ret < 0)
+         return ret;
      if (h->ps.pps->weighted_bipred_idc == 2 &&
          sl->slice_type_nos == AV_PICTURE_TYPE_B) {
          implicit_weight_table(h, sl, -1);