Merge commit '84b2d3fb68caf71cff4b80b44ff865d7ae2531ce'

* commit '84b2d3fb68caf71cff4b80b44ff865d7ae2531ce':
  h264: Drop unused function check_opcodes()

Merged-by: Clément Bœsch <u@pkh.me>

diff --cc libavcodec/h264_refs.c
index 5905276e833d2292f73de88e67aee6e4a1adf8ae,2e43a8f4e543c2c8fe2336685e17155839c54062..444849ae11ac8ae8b171aab8de1b3cd3bfe1db83
--- 1/libavcodec/h264_refs.c
--- 2/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@@ -577,30 -522,8 +577,15 @@@ void ff_h264_remove_all_refs(H264Contex
          h->short_ref[i] = NULL;
      }
      h->short_ref_count = 0;
 +
 +    memset(h->default_ref, 0, sizeof(h->default_ref));
 +    for (i = 0; i < h->nb_slice_ctx; i++) {
 +        H264SliceContext *sl = &h->slice_ctx[i];
 +        sl->list_count = sl->ref_count[0] = sl->ref_count[1] = 0;
 +        memset(sl->ref_list, 0, sizeof(sl->ref_list));
 +    }
  }
  
- static int check_opcodes(MMCO *mmco1, MMCO *mmco2, int n_mmcos)
- {
-     int i;
- 
-     for (i = 0; i < n_mmcos; i++) {
-         if (mmco1[i].opcode != mmco2[i].opcode) {
-             av_log(NULL, AV_LOG_ERROR, "MMCO opcode [%d, %d] at %d mismatches between slices\n",
-                    mmco1[i].opcode, mmco2[i].opcode, i);
-             return -1;
-         }
-     }
- 
-     return 0;
- }
- 
  static void generate_sliding_window_mmcos(H264Context *h)
  {
      MMCO *mmco = h->mmco;