diff options
author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-05-19 12:09:48 +0200 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-05-25 07:06:44 +0200 |
commit | 37140ebd87f549eae86a5b548d717a1e97203dd6 (patch) | |
tree | 7ebea45bb853a6c4d33ecbff2c59f84fb95dcf97 /libavformat/utils.c | |
parent | f08853b284514820d42f81999f4adb09ff5d95b4 (diff) | |
download | ffmpeg-37140ebd87f549eae86a5b548d717a1e97203dd6.tar.gz |
avformat/id3v2: Remove unnecessary indirection
ff_id3v2_parse_apic/chapters/priv/priv_dict all had a parameter
extra_meta of type ID3v2ExtraMeta ** as if the functions wanted to make
*extra_meta point to something else. But they don't, so just use an
ID3v2ExtraMeta *.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r-- | libavformat/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index b12aff5eb0..2fe58eb8ce 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -638,11 +638,11 @@ FF_ENABLE_DEPRECATION_WARNINGS if (id3v2_extra_meta) { if (!strcmp(s->iformat->name, "mp3") || !strcmp(s->iformat->name, "aac") || !strcmp(s->iformat->name, "tta") || !strcmp(s->iformat->name, "wav")) { - if ((ret = ff_id3v2_parse_apic(s, &id3v2_extra_meta)) < 0) + if ((ret = ff_id3v2_parse_apic(s, id3v2_extra_meta)) < 0) goto close; - if ((ret = ff_id3v2_parse_chapters(s, &id3v2_extra_meta)) < 0) + if ((ret = ff_id3v2_parse_chapters(s, id3v2_extra_meta)) < 0) goto close; - if ((ret = ff_id3v2_parse_priv(s, &id3v2_extra_meta)) < 0) + if ((ret = ff_id3v2_parse_priv(s, id3v2_extra_meta)) < 0) goto close; } else av_log(s, AV_LOG_DEBUG, "demuxer does not support additional id3 data, skipping\n"); |