RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Andreas Rheinhardt 2022-05-06 21:17:13 +02:00
parent 7803825cfc
commit aef16886dd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/internal.h
View File

@ -659,7 +659,7 @@ int ff_alloc_extradata(AVCodecParameters *par, int size);
* @param size size of extradata * @param size size of extradata
* @return >= 0 if OK, AVERROR_xxx on error * @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 * Copies the whilelists from one context to the other

4
libavformat/utils.c
View File

@ -359,7 +359,7 @@ int ff_alloc_extradata(AVCodecParameters *par, int size)
return 0; 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); int ret = ff_alloc_extradata(par, size);
if (ret < 0) if (ret < 0)
@ -368,7 +368,7 @@ int ff_get_extradata(AVFormatContext *s, AVCodecParameters *par, AVIOContext *pb
if (ret < 0) { if (ret < 0) {
av_freep(&par->extradata); av_freep(&par->extradata);
par->extradata_size = 0; 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; return ret;
} }