[FFmpeg-devel] [PATCH 26/44] avformat/internal: Make AVFormatContext* a logctx in ff_get_extradata

[Andreas Rheinhardt]

I.e. use void* instead of AVFormatContext*, because it is only used
for logging.

Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
 libavformat/internal.h | 2 +-
 libavformat/utils.c    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/internal.h b/libavformat/internal.h
index 4392f17d71..d46368228c 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -659,7 +659,7 @@ int ff_alloc_extradata(AVCodecParameters *par, int size);
  * @param size size of extradata
  * @return >= 0 if OK, AVERROR_xxx on error
  */
-int ff_get_extradata(AVFormatContext *s, AVCodecParameters *par, AVIOContext 
*pb, int size);
+int ff_get_extradata(void *logctx, AVCodecParameters *par, AVIOContext *pb, 
int size);
 
 /**
  * Copies the whilelists from one context to the other
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 98113086bd..00c0751195 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -359,7 +359,7 @@ int ff_alloc_extradata(AVCodecParameters *par, int size)
     return 0;
 }
 
-int ff_get_extradata(AVFormatContext *s, AVCodecParameters *par, AVIOContext 
*pb, int size)
+int ff_get_extradata(void *logctx, AVCodecParameters *par, AVIOContext *pb, 
int size)
 {
     int ret = ff_alloc_extradata(par, size);
     if (ret < 0)
@@ -368,7 +368,7 @@ int ff_get_extradata(AVFormatContext *s, AVCodecParameters 
*par, AVIOContext *pb
     if (ret < 0) {
         av_freep(&par->extradata);
         par->extradata_size = 0;
-        av_log(s, AV_LOG_ERROR, "Failed to read extradata of size %d\n", size);
+        av_log(logctx, AV_LOG_ERROR, "Failed to read extradata of size %d\n", 
size);
         return ret;
     }
 
-- 
2.32.0

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

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