[FFmpeg-devel] [PATCH] lavc: Replace 181 magic number with ITU_T_T35_COUNTRY_CODE_US

[FFmpeg-devel] [PATCH] lavc: Replace 181 magic number with ITU_T_T35_COUNTRY_CODE_US

[Tomas Härdin]

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

Looking at CTA-708 at the moment and noticed this. In the future we
might want to make it possible for the user to set the country code.
This patch makes finding usage of the US country code easier

Running FATE at the moment, but I don't expected it to fail from this
kind of change.

/Tomas

[-- Attachment #2: 0001-lavc-Replace-181-magic-number-with-ITU_T_T35_COUNTRY.patch --]
[-- Type: text/x-patch, Size: 4354 bytes --]

From 4ecfed10defcd1b2058ccde0ede517adc942ad3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <git@haerdin.se>
Date: Mon, 3 Mar 2025 13:22:08 +0100
Subject: [PATCH] lavc: Replace 181 magic number with ITU_T_T35_COUNTRY_CODE_US

---
 libavcodec/atsc_a53.c           | 3 ++-
 libavcodec/vaapi_encode_h264.c  | 3 ++-
 libavcodec/vaapi_encode_h265.c  | 3 ++-
 libavcodec/vulkan_encode_h264.c | 3 ++-
 libavcodec/vulkan_encode_h265.c | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/libavcodec/atsc_a53.c b/libavcodec/atsc_a53.c
index 1e9ea15ae0..cb90f85427 100644
--- a/libavcodec/atsc_a53.c
+++ b/libavcodec/atsc_a53.c
@@ -21,6 +21,7 @@
 
 #include "libavutil/mem.h"
 #include "atsc_a53.h"
+#include "itut35.h"
 #include "get_bits.h"
 
 int ff_alloc_a53_sei(const AVFrame *frame, size_t prefix_len,
@@ -44,7 +45,7 @@ int ff_alloc_a53_sei(const AVFrame *frame, size_t prefix_len,
     sei_data = (uint8_t*)*data + prefix_len;
 
     // country code
-    sei_data[0] = 181;
+    sei_data[0] = ITU_T_T35_COUNTRY_CODE_US;
     sei_data[1] = 0;
     sei_data[2] = 49;
 
diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
index ed20b9cd24..fc1e0d889d 100644
--- a/libavcodec/vaapi_encode_h264.c
+++ b/libavcodec/vaapi_encode_h264.c
@@ -28,6 +28,7 @@
 #include "libavutil/opt.h"
 
 #include "atsc_a53.h"
+#include "itut35.h"
 #include "avcodec.h"
 #include "cbs.h"
 #include "cbs_h264.h"
@@ -501,7 +502,7 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx,
         if (err < 0)
             return err;
         if (priv->sei_a53cc_data != NULL) {
-            priv->sei_a53cc.itu_t_t35_country_code = 181;
+            priv->sei_a53cc.itu_t_t35_country_code = ITU_T_T35_COUNTRY_CODE_US;
             priv->sei_a53cc.data = (uint8_t *)priv->sei_a53cc_data + 1;
             priv->sei_a53cc.data_length = sei_a53cc_len - 1;
 
diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c
index 44d9fdbbd5..e4ca1f695b 100644
--- a/libavcodec/vaapi_encode_h265.c
+++ b/libavcodec/vaapi_encode_h265.c
@@ -29,6 +29,7 @@
 #include "libavutil/mastering_display_metadata.h"
 
 #include "atsc_a53.h"
+#include "itut35.h"
 #include "avcodec.h"
 #include "cbs.h"
 #include "cbs_h265.h"
@@ -603,7 +604,7 @@ static int vaapi_encode_h265_init_picture_params(AVCodecContext *avctx,
         if (err < 0)
             return err;
         if (priv->sei_a53cc_data != NULL) {
-            priv->sei_a53cc.itu_t_t35_country_code = 181;
+            priv->sei_a53cc.itu_t_t35_country_code = ITU_T_T35_COUNTRY_CODE_US;
             priv->sei_a53cc.data = (uint8_t *)priv->sei_a53cc_data + 1;
             priv->sei_a53cc.data_length = sei_a53cc_len - 1;
 
diff --git a/libavcodec/vulkan_encode_h264.c b/libavcodec/vulkan_encode_h264.c
index cdc87fb4ca..42b7977db9 100644
--- a/libavcodec/vulkan_encode_h264.c
+++ b/libavcodec/vulkan_encode_h264.c
@@ -23,6 +23,7 @@
 #include "cbs.h"
 #include "cbs_h264.h"
 #include "atsc_a53.h"
+#include "itut35.h"
 
 #include "h264_levels.h"
 #include "h2645data.h"
@@ -233,7 +234,7 @@ static int vk_enc_h264_update_pic_info(AVCodecContext *avctx,
         if (err < 0)
             return err;
         if (enc->sei_a53cc_data != NULL) {
-            enc->sei_a53cc.itu_t_t35_country_code = 181;
+            enc->sei_a53cc.itu_t_t35_country_code = ITU_T_T35_COUNTRY_CODE_US;
             enc->sei_a53cc.data = (uint8_t *)enc->sei_a53cc_data + 1;
             enc->sei_a53cc.data_length = sei_a53cc_len - 1;
 
diff --git a/libavcodec/vulkan_encode_h265.c b/libavcodec/vulkan_encode_h265.c
index cd50f2f756..e67c9bb559 100644
--- a/libavcodec/vulkan_encode_h265.c
+++ b/libavcodec/vulkan_encode_h265.c
@@ -23,6 +23,7 @@
 #include "cbs.h"
 #include "cbs_h265.h"
 #include "atsc_a53.h"
+#include "itut35.h"
 #include "libavutil/mastering_display_metadata.h"
 
 #include "codec_internal.h"
@@ -280,7 +281,7 @@ static int vk_enc_h265_update_pic_info(AVCodecContext *avctx,
         if (err < 0)
             return err;
         if (enc->sei_a53cc_data != NULL) {
-            enc->sei_a53cc.itu_t_t35_country_code = 181;
+            enc->sei_a53cc.itu_t_t35_country_code = ITU_T_T35_COUNTRY_CODE_US;
             enc->sei_a53cc.data = (uint8_t *)enc->sei_a53cc_data + 1;
             enc->sei_a53cc.data_length = sei_a53cc_len - 1;
 
-- 
2.39.5


[-- Attachment #3: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] lavc: Replace 181 magic number with ITU_T_T35_COUNTRY_CODE_US

[Andreas Rheinhardt]

Tomas Härdin:
>  #include "libavutil/mem.h"
>  #include "atsc_a53.h"
> +#include "itut35.h"
>  #include "get_bits.h"
>  

Proper alphabetical ordering please. Here and in the other files.

- Andreas

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] lavc: Replace 181 magic number with ITU_T_T35_COUNTRY_CODE_US

[Devin Heitmueller]

On Mon, Mar 3, 2025 at 7:25 AM Tomas Härdin <git@haerdin.se> wrote:
>
> Looking at CTA-708 at the moment and noticed this. In the future we
> might want to make it possible for the user to set the country code.
> This patch makes finding usage of the US country code easier

I've got no objection to moving a constant value to a #define for the
purpose of clarity, but there should never be a reason it needs to be
configurable by the user.  The country code to be used for CTA-708 is
defined by the standards authority and must be 0xb5 (just as the
provider code must be 0x31).  Even if the captions are intended to
serve other countries, the country code will stay the same (defining
the country code for individual languages goes in the PMT).

Devin

-- 
Devin Heitmueller, Senior Software Engineer
LTN Global Communications
o: +1 (301) 363-1001
w: https://ltnglobal.com  e: devin.heitmueller@ltnglobal.com
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] lavc: Replace 181 magic number with ITU_T_T35_COUNTRY_CODE_US

[Tomas Härdin]

mån 2025-03-03 klockan 08:55 -0500 skrev Devin Heitmueller:
> On Mon, Mar 3, 2025 at 7:25 AM Tomas Härdin <git@haerdin.se> wrote:
> > 
> > Looking at CTA-708 at the moment and noticed this. In the future we
> > might want to make it possible for the user to set the country
> > code.
> > This patch makes finding usage of the US country code easier
> 
> I've got no objection to moving a constant value to a #define for the
> purpose of clarity, but there should never be a reason it needs to be
> configurable by the user.  The country code to be used for CTA-708 is
> defined by the standards authority and must be 0xb5 (just as the
> provider code must be 0x31).

So it's "US" even if something is broadcast in Sweden? T.35 has a whole
list of countries, some of which don't exist any more, and some new
ones are missing

> Even if the captions are intended to
> serve other countries, the country code will stay the same (defining
> the country code for individual languages goes in the PMT).

How is one supposed to mux multiple subtitle languages in MPEGTS +
H.264 anyway? This isn't clear at all from what I've read. Country
codes, as opposed to language codes, being used in the 708 SEI makes it
worse. And what of other container formats that have no PMT?

/Tomas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] lavc: Replace 181 magic number with ITU_T_T35_COUNTRY_CODE_US

[Tomas Härdin]

[-- Attachment #1: Type: text/plain, Size: 433 bytes --]

mån 2025-03-03 klockan 14:12 +0100 skrev Andreas Rheinhardt:
> Tomas Härdin:
> >  #include "libavutil/mem.h"
> >  #include "atsc_a53.h"
> > +#include "itut35.h"
> >  #include "get_bits.h"
> >  
> 
> Proper alphabetical ordering please. Here and in the other files.

A bit difficult since none of the other includes are in order. But I
made a second patch that sorts them all, keeping <> includes separate

/Tomas

[-- Attachment #2: 0001-lavc-Replace-181-magic-number-with-ITU_T_T35_COUNTRY.patch --]
[-- Type: text/x-patch, Size: 4401 bytes --]

From 7e95bbec4dd8eb2a96387eceeda6c0c236766fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <git@haerdin.se>
Date: Mon, 3 Mar 2025 13:22:08 +0100
Subject: [PATCH 1/2] lavc: Replace 181 magic number with
 ITU_T_T35_COUNTRY_CODE_US

---
 libavcodec/atsc_a53.c           | 3 ++-
 libavcodec/vaapi_encode_h264.c  | 3 ++-
 libavcodec/vaapi_encode_h265.c  | 3 ++-
 libavcodec/vulkan_encode_h264.c | 3 ++-
 libavcodec/vulkan_encode_h265.c | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/libavcodec/atsc_a53.c b/libavcodec/atsc_a53.c
index 1e9ea15ae0..2fdaa66e88 100644
--- a/libavcodec/atsc_a53.c
+++ b/libavcodec/atsc_a53.c
@@ -22,6 +22,7 @@
 #include "libavutil/mem.h"
 #include "atsc_a53.h"
 #include "get_bits.h"
+#include "itut35.h"
 
 int ff_alloc_a53_sei(const AVFrame *frame, size_t prefix_len,
                      void **data, size_t *sei_size)
@@ -44,7 +45,7 @@ int ff_alloc_a53_sei(const AVFrame *frame, size_t prefix_len,
     sei_data = (uint8_t*)*data + prefix_len;
 
     // country code
-    sei_data[0] = 181;
+    sei_data[0] = ITU_T_T35_COUNTRY_CODE_US;
     sei_data[1] = 0;
     sei_data[2] = 49;
 
diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
index ed20b9cd24..3f9b1be627 100644
--- a/libavcodec/vaapi_encode_h264.c
+++ b/libavcodec/vaapi_encode_h264.c
@@ -36,6 +36,7 @@
 #include "hw_base_encode_h264.h"
 #include "h264_levels.h"
 #include "h2645data.h"
+#include "itut35.h"
 #include "vaapi_encode.h"
 #include "version.h"
 
@@ -501,7 +502,7 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx,
         if (err < 0)
             return err;
         if (priv->sei_a53cc_data != NULL) {
-            priv->sei_a53cc.itu_t_t35_country_code = 181;
+            priv->sei_a53cc.itu_t_t35_country_code = ITU_T_T35_COUNTRY_CODE_US;
             priv->sei_a53cc.data = (uint8_t *)priv->sei_a53cc_data + 1;
             priv->sei_a53cc.data_length = sei_a53cc_len - 1;
 
diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c
index 44d9fdbbd5..c8f08ae443 100644
--- a/libavcodec/vaapi_encode_h265.c
+++ b/libavcodec/vaapi_encode_h265.c
@@ -36,6 +36,7 @@
 #include "codec_internal.h"
 #include "h2645data.h"
 #include "h265_profile_level.h"
+#include "itut35.h"
 #include "vaapi_encode.h"
 
 #include "hevc/hevc.h"
@@ -603,7 +604,7 @@ static int vaapi_encode_h265_init_picture_params(AVCodecContext *avctx,
         if (err < 0)
             return err;
         if (priv->sei_a53cc_data != NULL) {
-            priv->sei_a53cc.itu_t_t35_country_code = 181;
+            priv->sei_a53cc.itu_t_t35_country_code = ITU_T_T35_COUNTRY_CODE_US;
             priv->sei_a53cc.data = (uint8_t *)priv->sei_a53cc_data + 1;
             priv->sei_a53cc.data_length = sei_a53cc_len - 1;
 
diff --git a/libavcodec/vulkan_encode_h264.c b/libavcodec/vulkan_encode_h264.c
index cdc87fb4ca..51ced5d6ad 100644
--- a/libavcodec/vulkan_encode_h264.c
+++ b/libavcodec/vulkan_encode_h264.c
@@ -29,6 +29,7 @@
 #include "codec_internal.h"
 #include "version.h"
 #include "hw_base_encode_h264.h"
+#include "itut35.h"
 
 #include "vulkan_encode.h"
 
@@ -233,7 +234,7 @@ static int vk_enc_h264_update_pic_info(AVCodecContext *avctx,
         if (err < 0)
             return err;
         if (enc->sei_a53cc_data != NULL) {
-            enc->sei_a53cc.itu_t_t35_country_code = 181;
+            enc->sei_a53cc.itu_t_t35_country_code = ITU_T_T35_COUNTRY_CODE_US;
             enc->sei_a53cc.data = (uint8_t *)enc->sei_a53cc_data + 1;
             enc->sei_a53cc.data_length = sei_a53cc_len - 1;
 
diff --git a/libavcodec/vulkan_encode_h265.c b/libavcodec/vulkan_encode_h265.c
index cd50f2f756..1776da4aa3 100644
--- a/libavcodec/vulkan_encode_h265.c
+++ b/libavcodec/vulkan_encode_h265.c
@@ -28,6 +28,7 @@
 #include "codec_internal.h"
 #include "version.h"
 #include "hw_base_encode_h265.h"
+#include "itut35.h"
 
 #include "vulkan_encode.h"
 
@@ -280,7 +281,7 @@ static int vk_enc_h265_update_pic_info(AVCodecContext *avctx,
         if (err < 0)
             return err;
         if (enc->sei_a53cc_data != NULL) {
-            enc->sei_a53cc.itu_t_t35_country_code = 181;
+            enc->sei_a53cc.itu_t_t35_country_code = ITU_T_T35_COUNTRY_CODE_US;
             enc->sei_a53cc.data = (uint8_t *)enc->sei_a53cc_data + 1;
             enc->sei_a53cc.data_length = sei_a53cc_len - 1;
 
-- 
2.39.5


[-- Attachment #3: 0002-lavc-Sort-some-includes.patch --]
[-- Type: text/x-patch, Size: 4805 bytes --]

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


[-- Attachment #4: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] lavc: Replace 181 magic number with ITU_T_T35_COUNTRY_CODE_US

[Andreas Rheinhardt]

Tomas Härdin:
>   * 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"

By alphabetical ordering we mean alphabetical ordering within the
headers from a given library, not that "libavutil/mem.h" comes between
itut35.h and vulkan_encode.h. LGTM to the first patch.

- Andreas

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".