Merge commit 'd1f539c97e04e7cebecaf6916c5064f243d39fcf'

* commit 'd1f539c97e04e7cebecaf6916c5064f243d39fcf':
  h264: merge the two reinit blocks in slice_header_parse()

Merged-by: Clément Bœsch <clement@stupeflix.com>

diff --cc libavcodec/h264_slice.c
index 359c6a9d4d23310bf11c78109d99f28c124ee93a,13988f4b92aaa9e580950b748fdf793f12747836..30594c1ef66020982ba30d4827e818bfdee0e7e8
--- 1/libavcodec/h264_slice.c
--- 2/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@@ -1414,8 -1201,7 +1414,7 @@@ static int h264_slice_header_parse(H264
          }
      }
  
-     if (h->context_initialized &&
-         (must_reinit || needs_reinit)) {
 -    if (!h->context_initialized || needs_reinit) {
++    if (!h->context_initialized || must_reinit || needs_reinit) {
          h->context_initialized = 0;
          if (sl != h->slice_ctx) {
              av_log(h->avctx, AV_LOG_ERROR,
@@@ -1435,8 -1219,8 +1434,8 @@@
              return ret;
          h->avctx->pix_fmt = ret;
  
-         av_log(h->avctx, AV_LOG_INFO, "Reinit context to %dx%d, "
+         av_log(h->avctx, AV_LOG_VERBOSE, "Reinit context to %dx%d, "
 -               "pix_fmt: %d\n", h->width, h->height, h->avctx->pix_fmt);
 +               "pix_fmt: %s\n", h->width, h->height, av_get_pix_fmt_name(h->avctx->pix_fmt));
  
          if ((ret = h264_slice_header_init(h)) < 0) {
              av_log(h->avctx, AV_LOG_ERROR,
@@@ -1444,33 -1228,8 +1443,16 @@@
              return ret;
          }
      }
-     if (!h->context_initialized) {
-         if (sl != h->slice_ctx) {
-             av_log(h->avctx, AV_LOG_ERROR,
-                    "Cannot (re-)initialize context during parallel decoding.\n");
-             return AVERROR_PATCHWELCOME;
-         }
- 
-         if ((ret = get_pixel_format(h, 1)) < 0)
-             return ret;
-         h->avctx->pix_fmt = ret;
- 
-         if ((ret = h264_slice_header_init(h)) < 0) {
-             av_log(h->avctx, AV_LOG_ERROR,
-                    "h264_slice_header_init() failed\n");
-             return ret;
-         }
-     }
  
      frame_num = get_bits(&sl->gb, sps->log2_max_frame_num);
 +    if (!first_slice) {
 +        if (h->poc.frame_num != frame_num) {
 +            av_log(h->avctx, AV_LOG_ERROR, "Frame num change from %d to %d\n",
 +                   h->poc.frame_num, frame_num);
 +            return AVERROR_INVALIDDATA;
 +        }
 +    }
 +
      if (!h->setup_finished)
          h->poc.frame_num = frame_num;