summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-05-06 21:17:13 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-05-10 07:43:26 +0200
commitaef16886dde59d41bdeef8dfe78cd7d9055bf50e (patch)
treed7bc7b78528de9023595d10d570fa1e6a485b2ac
parent7803825cfc580be42dcc280582bd6b2a87d83fb4 (diff)
avformat/internal: Make AVFormatContext* a logctx in ff_get_extradata
I.e. use void* instead of AVFormatContext*, because it is only used for logging. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavformat/internal.h2
-rw-r--r--libavformat/utils.c4
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;
}