Merge commit 'b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661'

* commit 'b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661':
  h264: Kill broken disabled cruft

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

diff --cc libavcodec/h264_ps.c
Simple merge

diff --cc libavcodec/h264_refs.c
index ad296753c3bd9f236037095f8b785d2c11d506dc,3c55998424f0bdefeaea0ffbc3c93b3d128dfaf9..af708295943ccd65dff383d6274596bbd3cced2e
--- 1/libavcodec/h264_refs.c
--- 2/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@@ -844,17 -752,8 +844,8 @@@ int ff_h264_decode_ref_pic_marking(H264
                  mmco[i].opcode = opcode;
                  if (opcode == MMCO_SHORT2UNUSED || opcode == MMCO_SHORT2LONG) {
                      mmco[i].short_pic_num =
 -                        (sl->curr_pic_num - get_ue_golomb(gb) - 1) &
 +                        (sl->curr_pic_num - get_ue_golomb_long(gb) - 1) &
                              (sl->max_pic_num - 1);
- #if 0
-                     if (mmco[i].short_pic_num >= h->short_ref_count ||
-                         !h->short_ref[mmco[i].short_pic_num]) {
-                         av_log(s->avctx, AV_LOG_ERROR,
-                                "illegal short ref in memory management control "
-                                "operation %d\n", mmco);
-                         return -1;
-                     }
- #endif
                  }
                  if (opcode == MMCO_SHORT2LONG || opcode == MMCO_LONG2UNUSED ||
                      opcode == MMCO_LONG || opcode == MMCO_SET_MAX_LONG) {