[FFmpeg-devel] [PATCH 11/15] avformat/dovi_isom: Don't use AVFormatContext* for logctx

[Andreas Rheinhardt]

Pass it as void* instead. While just at it, also constify
the pointee of AVDOVIDecoderConfigurationRecord* in
ff_isom_put_dvcc_dvvc().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
 libavformat/dovi_isom.c | 12 +++++++-----
 libavformat/dovi_isom.h |  7 ++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/libavformat/dovi_isom.c b/libavformat/dovi_isom.c
index 76681b9451..c8fdf566e4 100644
--- a/libavformat/dovi_isom.c
+++ b/libavformat/dovi_isom.c
@@ -28,7 +28,8 @@
 #include "avformat.h"
 #include "dovi_isom.h"
 
-int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf_ptr, uint64_t size)
+int ff_isom_parse_dvcc_dvvc(void *logctx, AVStream *st,
+                            const uint8_t *buf_ptr, uint64_t size)
 {
     uint32_t buf;
     AVDOVIDecoderConfigurationRecord *dovi;
@@ -70,7 +71,7 @@ int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf
         return ret;
     }
 
-    av_log(s, AV_LOG_TRACE, "DOVI in dvcC/dvvC/dvwC box, version: %d.%d, profile: %d, level: %d, "
+    av_log(logctx, AV_LOG_TRACE, "DOVI in dvcC/dvvC/dvwC box, version: %d.%d, profile: %d, level: %d, "
            "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n",
            dovi->dv_version_major, dovi->dv_version_minor,
            dovi->dv_profile, dovi->dv_level,
@@ -82,8 +83,8 @@ int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf
     return 0;
 }
 
-void ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t out[ISOM_DVCC_DVVC_SIZE],
-                           AVDOVIDecoderConfigurationRecord *dovi)
+void ff_isom_put_dvcc_dvvc(void *logctx, uint8_t out[ISOM_DVCC_DVVC_SIZE],
+                           const AVDOVIDecoderConfigurationRecord *dovi)
 {
     PutBitContext pb;
 
@@ -106,7 +107,8 @@ void ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t out[ISOM_DVCC_DVVC_SIZE],
 
     flush_put_bits(&pb);
 
-    av_log(s, AV_LOG_DEBUG, "DOVI in %s box, version: %d.%d, profile: %d, level: %d, "
+    av_log(logctx, AV_LOG_DEBUG,
+           "DOVI in %s box, version: %d.%d, profile: %d, level: %d, "
            "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n",
            dovi->dv_profile > 10 ? "dvwC" : (dovi->dv_profile > 7 ? "dvvC" : "dvcC"),
            dovi->dv_version_major, dovi->dv_version_minor,
diff --git a/libavformat/dovi_isom.h b/libavformat/dovi_isom.h
index 1526164319..1221a52793 100644
--- a/libavformat/dovi_isom.h
+++ b/libavformat/dovi_isom.h
@@ -28,8 +28,9 @@
 
 #define ISOM_DVCC_DVVC_SIZE 24
 
-int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf_ptr, uint64_t size);
-void ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t out[ISOM_DVCC_DVVC_SIZE],
-                           AVDOVIDecoderConfigurationRecord *dovi);
+int ff_isom_parse_dvcc_dvvc(void *logctx, AVStream *st,
+                            const uint8_t *buf_ptr, uint64_t size);
+void ff_isom_put_dvcc_dvvc(void *logctx, uint8_t out[ISOM_DVCC_DVVC_SIZE],
+                           const AVDOVIDecoderConfigurationRecord *dovi);
 
 #endif /* AVFORMAT_DOVI_ISOM_H */
-- 
2.34.1