avfilter/formats: Remove avfilter_make_format64_list()

[ffmpeg] / libavcodec / dynamic_hdr10_plus.c

diff --git a/libavcodec/dynamic_hdr10_plus.c b/libavcodec/dynamic_hdr10_plus.c
index bf0d085b8f0fc8fa23308f0e4fecdb1943044f94..a602e606ed3539c79e4ab84b8dde5ea043708885 100644 (file)
--- a/libavcodec/dynamic_hdr10_plus.c
+++ b/libavcodec/dynamic_hdr10_plus.c
@@ -17,11 +17,8 @@
  */
 
 #include "dynamic_hdr10_plus.h"
+#include "get_bits.h"
 
-static const uint8_t usa_country_code = 0xB5;
-static const uint16_t smpte_provider_code = 0x003C;
-static const uint16_t smpte2094_40_provider_oriented_code = 0x0001;
-static const uint16_t smpte2094_40_application_identifier = 0x04;
 static const int64_t luminance_den = 1;
 static const int32_t peak_luminance_den = 15;
 static const int64_t rgb_den = 100000;
@@ -30,11 +27,19 @@ static const int32_t knee_point_den = 4095;
 static const int32_t bezier_anchor_den = 1023;
 static const int32_t saturation_weight_den = 8;
 
-int ff_parse_itu_t_t35_to_dynamic_hdr10_plus(GetBitContext *gb, AVDynamicHDRPlus *s)
+int ff_parse_itu_t_t35_to_dynamic_hdr10_plus(AVDynamicHDRPlus *s, const uint8_t *data,
+                                             int size)
 {
+    GetBitContext gbc, *gb = &gbc;
+    int ret;
+
     if (!s)
         return AVERROR(ENOMEM);
 
+    ret = init_get_bits8(gb, data, size);
+    if (ret < 0)
+        return ret;
+
     s->application_version = get_bits(gb, 8);
 
     if (get_bits_left(gb) < 2)
@@ -189,7 +194,5 @@ int ff_parse_itu_t_t35_to_dynamic_hdr10_plus(GetBitContext *gb, AVDynamicHDRPlus
         }
     }
 
-    skip_bits(gb, get_bits_left(gb));
-
     return 0;
 }