| Message ID | 2353fb95968f447f88e22aaa17025b38@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] avformat/wavdec: fix the ID3 metadata obtained in WAV format's missing | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Wujian(Chin) <wujian2@huawei.com> 于2022年8月22日周一 22:00写道： > > Fixes ticket #9848. > > Signed-off-by: wujian_nanjing <wujian2@huawei.com> > --- > libavformat/wavdec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c > index ca61b84..e3f790f 100644 > --- a/libavformat/wavdec.c > +++ b/libavformat/wavdec.c > @@ -555,7 +555,7 @@ static int wav_read_header(AVFormatContext *s) > case MKTAG('I', 'D', '3', ' '): > case MKTAG('i', 'd', '3', ' '): { > ID3v2ExtraMeta *id3v2_extra_meta; > - ff_id3v2_read_dict(pb, &ffformatcontext(s)->id3v2_meta, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta); > + ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, 0); > if (id3v2_extra_meta) { > ff_id3v2_parse_apic(s, id3v2_extra_meta); > ff_id3v2_parse_chapters(s, id3v2_extra_meta); > -- > 2.7.4 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". Tested ok to me, will push this patch after 24 hours if there have no objections. Thanks Steven
Steven Liu <lingjiujianke@gmail.com> 于2022年8月23日周二 09:59写道： > > Wujian(Chin) <wujian2@huawei.com> 于2022年8月22日周一 22:00写道： > > > > Fixes ticket #9848. > > > > Signed-off-by: wujian_nanjing <wujian2@huawei.com> > > --- > > libavformat/wavdec.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c > > index ca61b84..e3f790f 100644 > > --- a/libavformat/wavdec.c > > +++ b/libavformat/wavdec.c > > @@ -555,7 +555,7 @@ static int wav_read_header(AVFormatContext *s) > > case MKTAG('I', 'D', '3', ' '): > > case MKTAG('i', 'd', '3', ' '): { > > ID3v2ExtraMeta *id3v2_extra_meta; > > - ff_id3v2_read_dict(pb, &ffformatcontext(s)->id3v2_meta, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta); > > + ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, 0); > > if (id3v2_extra_meta) { > > ff_id3v2_parse_apic(s, id3v2_extra_meta); > > ff_id3v2_parse_chapters(s, id3v2_extra_meta); > > -- > > 2.7.4 > > > > _______________________________________________ > > ffmpeg-devel mailing list > > ffmpeg-devel@ffmpeg.org > > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > > > To unsubscribe, visit link above, or email > > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > > Tested ok to me, will push this patch after 24 hours if there have no > objections. Pushed. Thanks Steven
diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index ca61b84..e3f790f 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -555,7 +555,7 @@ static int wav_read_header(AVFormatContext *s) case MKTAG('I', 'D', '3', ' '): case MKTAG('i', 'd', '3', ' '): { ID3v2ExtraMeta *id3v2_extra_meta; - ff_id3v2_read_dict(pb, &ffformatcontext(s)->id3v2_meta, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta); + ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, 0); if (id3v2_extra_meta) { ff_id3v2_parse_apic(s, id3v2_extra_meta); ff_id3v2_parse_chapters(s, id3v2_extra_meta);
Fixes ticket #9848. Signed-off-by: wujian_nanjing <wujian2@huawei.com> --- libavformat/wavdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)