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/hls.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/hls.c')
-rw-r--r-- | libavformat/hls.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index 96bddfa410..3e35d157ad 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1070,12 +1070,12 @@ static void handle_id3(AVIOContext *pb, struct playlist *pls) /* get picture attachment and set text metadata */ if (pls->ctx->nb_streams) - ff_id3v2_parse_apic(pls->ctx, &extra_meta); + ff_id3v2_parse_apic(pls->ctx, extra_meta); else /* demuxer not yet opened, defer picture attachment */ pls->id3_deferred_extra = extra_meta; - ff_id3v2_parse_priv_dict(&metadata, &extra_meta); + ff_id3v2_parse_priv_dict(&metadata, extra_meta); av_dict_copy(&pls->ctx->metadata, metadata, 0); pls->id3_initial = metadata; @@ -1965,9 +1965,9 @@ static int hls_read_header(AVFormatContext *s) goto fail; if (pls->id3_deferred_extra && pls->ctx->nb_streams == 1) { - ff_id3v2_parse_apic(pls->ctx, &pls->id3_deferred_extra); + ff_id3v2_parse_apic(pls->ctx, pls->id3_deferred_extra); avformat_queue_attached_pictures(pls->ctx); - ff_id3v2_parse_priv(pls->ctx, &pls->id3_deferred_extra); + ff_id3v2_parse_priv(pls->ctx, pls->id3_deferred_extra); ff_id3v2_free_extra_meta(&pls->id3_deferred_extra); } |