From b9dacc4d5d01f059cb6ec886d278f6126245b1f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <git@haerdin.se>
Date: Tue, 4 Mar 2025 10:10:27 +0100
Subject: [PATCH 2/2] lavc: Sort some includes

---
 libavcodec/atsc_a53.c           |  2 +-
 libavcodec/vaapi_encode_h264.c  | 18 ++++++++----------
 libavcodec/vaapi_encode_h265.c  | 21 +++++++++------------
 libavcodec/vulkan_encode_h264.c | 17 +++++++----------
 libavcodec/vulkan_encode_h265.c | 15 ++++++---------
 5 files changed, 31 insertions(+), 42 deletions(-)

diff --git a/libavcodec/atsc_a53.c b/libavcodec/atsc_a53.c
index 2fdaa66e88..9e6c36e751 100644
--- a/libavcodec/atsc_a53.c
+++ b/libavcodec/atsc_a53.c
@@ -19,10 +19,10 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "libavutil/mem.h"
 #include "atsc_a53.h"
 #include "get_bits.h"
 #include "itut35.h"
+#include "libavutil/mem.h"
 
 int ff_alloc_a53_sei(const AVFrame *frame, size_t prefix_len,
                      void **data, size_t *sei_size)
diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
index 3f9b1be627..cae6175872 100644
--- a/libavcodec/vaapi_encode_h264.c
+++ b/libavcodec/vaapi_encode_h264.c
@@ -17,26 +17,24 @@
  */
 
 #include <string.h>
-
-#include <va/va.h>
 #include <va/va_enc_h264.h>
-
-#include "libavutil/avassert.h"
-#include "libavutil/common.h"
-#include "libavutil/mem.h"
-#include "libavutil/pixdesc.h"
-#include "libavutil/opt.h"
+#include <va/va.h>
 
 #include "atsc_a53.h"
 #include "avcodec.h"
 #include "cbs.h"
 #include "cbs_h264.h"
 #include "codec_internal.h"
+#include "h2645data.h"
 #include "h264.h"
-#include "hw_base_encode_h264.h"
 #include "h264_levels.h"
-#include "h2645data.h"
+#include "hw_base_encode_h264.h"
 #include "itut35.h"
+#include "libavutil/avassert.h"
+#include "libavutil/common.h"
+#include "libavutil/mem.h"
+#include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
 #include "vaapi_encode.h"
 #include "version.h"
 
diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c
index c8f08ae443..30abf74431 100644
--- a/libavcodec/vaapi_encode_h265.c
+++ b/libavcodec/vaapi_encode_h265.c
@@ -17,30 +17,27 @@
  */
 
 #include <string.h>
-
-#include <va/va.h>
 #include <va/va_enc_hevc.h>
-
-#include "libavutil/avassert.h"
-#include "libavutil/common.h"
-#include "libavutil/mem.h"
-#include "libavutil/pixdesc.h"
-#include "libavutil/opt.h"
-#include "libavutil/mastering_display_metadata.h"
+#include <va/va.h>
 
 #include "atsc_a53.h"
 #include "avcodec.h"
 #include "cbs.h"
 #include "cbs_h265.h"
-#include "hw_base_encode_h265.h"
 #include "codec_internal.h"
 #include "h2645data.h"
 #include "h265_profile_level.h"
+#include "hevc/hevc.h"
+#include "hw_base_encode_h265.h"
 #include "itut35.h"
+#include "libavutil/avassert.h"
+#include "libavutil/common.h"
+#include "libavutil/mastering_display_metadata.h"
+#include "libavutil/mem.h"
+#include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
 #include "vaapi_encode.h"
 
-#include "hevc/hevc.h"
-
 enum {
     SEI_MASTERING_DISPLAY       = 0x08,
     SEI_CONTENT_LIGHT_LEVEL     = 0x10,
diff --git a/libavcodec/vulkan_encode_h264.c b/libavcodec/vulkan_encode_h264.c
index 51ced5d6ad..c404698f59 100644
--- a/libavcodec/vulkan_encode_h264.c
+++ b/libavcodec/vulkan_encode_h264.c
@@ -16,21 +16,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/internal.h"
-#include "libavutil/opt.h"
-#include "libavutil/mem.h"
-
+#include "atsc_a53.h"
 #include "cbs.h"
 #include "cbs_h264.h"
-#include "atsc_a53.h"
-
-#include "h264_levels.h"
-#include "h2645data.h"
 #include "codec_internal.h"
-#include "version.h"
+#include "h2645data.h"
+#include "h264_levels.h"
 #include "hw_base_encode_h264.h"
 #include "itut35.h"
-
+#include "libavutil/internal.h"
+#include "libavutil/mem.h"
+#include "libavutil/opt.h"
+#include "version.h"
 #include "vulkan_encode.h"
 
 enum UnitElems {
diff --git a/libavcodec/vulkan_encode_h265.c b/libavcodec/vulkan_encode_h265.c
index 1776da4aa3..3aa1ae1368 100644
--- a/libavcodec/vulkan_encode_h265.c
+++ b/libavcodec/vulkan_encode_h265.c
@@ -16,20 +16,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/internal.h"
-#include "libavutil/opt.h"
-#include "libavutil/mem.h"
-
+#include "atsc_a53.h"
 #include "cbs.h"
 #include "cbs_h265.h"
-#include "atsc_a53.h"
-#include "libavutil/mastering_display_metadata.h"
-
 #include "codec_internal.h"
-#include "version.h"
 #include "hw_base_encode_h265.h"
 #include "itut35.h"
-
+#include "libavutil/internal.h"
+#include "libavutil/mastering_display_metadata.h"
+#include "libavutil/mem.h"
+#include "libavutil/opt.h"
+#include "version.h"
 #include "vulkan_encode.h"
 
 enum UnitElems {
-- 
2.39.5