Merge commit 'ff007e30d8d45ba1ff2b2a4615f1cd5bafb50626'

* commit 'ff007e30d8d45ba1ff2b2a4615f1cd5bafb50626':
  vaapi_h264: Add workaround for bad SEI in old Intel drivers

Merged-by: Mark Thompson <sw@jkqxz.net>

diff --cc libavcodec/vaapi_encode_h264.c
index 1d43e934ef0152a3d13aadea5294ee4b0ed294f0,377e3652de738c68c6b0d33fa3200319953c7d87..5fd0bf7796d73d71a21d8f72bb7ebd6d0f2609af
--- 1/libavcodec/vaapi_encode_h264.c
--- 2/libavcodec/vaapi_encode_h264.c
+++ b/libavcodec/vaapi_encode_h264.c
@@@ -254,10 -251,23 +255,23 @@@ static int vaapi_encode_h264_write_extr
          if (err < 0)
              goto fail;
  
 -        ff_cbs_fragment_uninit(&priv->cbc, au);
 +        ff_cbs_fragment_uninit(priv->cbc, au);
  
 -        *type = VAEncPackedHeaderH264_SEI;
 +        *type = VAEncPackedHeaderRawData;
          return 0;
 -#if !HAVE_VAAPI_1
+ 
++#if !CONFIG_VAAPI_1
+     } else if (priv->sei_cbr_workaround_needed) {
+         // Insert a zero-length header using the old SEI type.  This is
+         // required to avoid triggering broken behaviour on Intel platforms
+         // in CBR mode where an invalid SEI message is generated by the
+         // driver and inserted into the stream.
+         *data_len = 0;
+         *type = VAEncPackedHeaderH264_SEI;
+         priv->sei_cbr_workaround_needed = 0;
+         return 0;
+ #endif
+ 
      } else {
          return AVERROR_EOF;
      }
@@@ -614,6 -622,10 +628,10 @@@ static int vaapi_encode_h264_init_pictu
  
      if (opt->sei & SEI_IDENTIFIER && pic->encode_order == 0)
          priv->sei_needed = 1;
 -#if !HAVE_VAAPI_1
++#if !CONFIG_VAAPI_1
+     if (ctx->va_rc_mode == VA_RC_CBR)
+         priv->sei_cbr_workaround_needed = 1;
+ #endif
  
      if (opt->sei & SEI_TIMING) {
          memset(&priv->pic_timing, 0, sizeof(priv->pic_timing));