Merge commit 'b13fc1e344011949929975a3451f78f226aa1de3'

* commit 'b13fc1e344011949929975a3451f78f226aa1de3':
  h264: do not pass H264Context to h264_slice_header_parse()

Conflicts:
	libavcodec/h264dec.h

Did not merge the h264_slice_header_parse() part. We use a few other
members of H264Context for error checking in that function.

Merged-by: Timothy Gu <timothygu99@gmail.com>

diff --cc libavcodec/h264_refs.c
Simple merge

diff --cc libavcodec/h264_slice.c
index 08e59aac48301271f8ac5eb0b4b056b47b171139,32180225fc59f3032cffa1720939df0eeb78c896..f32a74aea0f72ec039ce5345b8e8eec72c98062b
--- 1/libavcodec/h264_slice.c
--- 2/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@@ -1635,7 -1457,7 +1635,7 @@@ static int h264_slice_header_parse(cons
          return ret;
  
      if (sl->slice_type_nos != AV_PICTURE_TYPE_I) {
-        ret = ff_h264_decode_ref_pic_list_reordering(h, sl);
 -       ret = ff_h264_decode_ref_pic_list_reordering(sl, avctx);
++       ret = ff_h264_decode_ref_pic_list_reordering(sl, h->avctx);
         if (ret < 0) {
             sl->ref_count[1] = sl->ref_count[0] = 0;
             return ret;
@@@ -1655,8 -1477,8 +1655,8 @@@
  
      sl->explicit_ref_marking = 0;
      if (nal->ref_idc) {
-         ret = ff_h264_decode_ref_pic_marking(h, sl, &sl->gb);
 -        ret = ff_h264_decode_ref_pic_marking(sl, &sl->gb, nal, avctx);
 -        if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE))
++        ret = ff_h264_decode_ref_pic_marking(sl, &sl->gb, nal, h->avctx);
 +        if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE))
              return AVERROR_INVALIDDATA;
      }
  

diff --cc libavcodec/h264dec.h
index 7634261d4119bb77f46b60dd1a4d7d3ce333ea06,e422871a627d3f7bc541c84d3147c77d470b0e7f..9483efbc436f3ba1070d297ce7af838ba8c8feb5
--- 1/libavcodec/h264dec.h
--- 2/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@@ -574,8 -528,8 +574,8 @@@ int ff_h264_get_slice_type(const H264Sl
   */
  int ff_h264_alloc_tables(H264Context *h);
  
- int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContext *sl);
+ int ff_h264_decode_ref_pic_list_reordering(H264SliceContext *sl, void *logctx);
 -int ff_h264_build_ref_list(const H264Context *h, H264SliceContext *sl);
 +int ff_h264_build_ref_list(H264Context *h, H264SliceContext *sl);
  void ff_h264_remove_all_refs(H264Context *h);
  
  /**