diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index d0608e7c55..4b905bf9da 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -892,6 +892,11 @@ static av_cold int X264_init(AVCodecContext *avctx)
         }
     }
 
+#if X264_BUILD >= 142
+    /* Separate headers not supported in AVC-Intra mode */
+    if (x4->params.i_avcintra_class >= 0)
+        x4->params.b_repeat_headers = 1;
+#endif
 
     {
         AVDictionaryEntry *en = NULL;