Merge commit 'e9f884416c76558098fc1f63825b293956e8483c'

* commit 'e9f884416c76558098fc1f63825b293956e8483c':
  h264: move reading direct_spatial_mv_pred out of ff_set_ref_count()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

diff --cc libavcodec/h264.c
index 2a522fd,08b0891..3e29e88
--- 1/libavcodec/h264.c
--- 2/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@@ -1007,11 -975,6 +1007,9 @@@ int ff_set_ref_count(H264Context *h, H2
      ref_count[1] = h->pps.ref_count[1];
  
      if (sl->slice_type_nos != AV_PICTURE_TYPE_I) {
-         if (sl->slice_type_nos == AV_PICTURE_TYPE_B)
-             sl->direct_spatial_mv_pred = get_bits1(&sl->gb);
 +        unsigned max[2];
 +        max[0] = max[1] = h->picture_structure == PICT_FRAME ? 15 : 31;
 +
          num_ref_idx_active_override_flag = get_bits1(&sl->gb);
  
          if (num_ref_idx_active_override_flag) {

diff --cc libavcodec/h264_parser.c
Simple merge

diff --cc libavcodec/h264_slice.c
Simple merge