static void read_id3(AVFormatContext *s, uint64_t id3pos)
{
- ID3v2ExtraMeta *id3v2_extra_meta = NULL;
+ ID3v2ExtraMeta *id3v2_extra_meta;
if (avio_seek(s->pb, id3pos, SEEK_SET) < 0)
return;
dsf->audio_size = avio_rl64(pb) / 8 * st->codecpar->channels;
st->codecpar->block_align = avio_rl32(pb);
- if (st->codecpar->block_align > INT_MAX / st->codecpar->channels) {
- avpriv_request_sample(s, "block_align overflow");
+ if (st->codecpar->block_align > INT_MAX / st->codecpar->channels || st->codecpar->block_align <= 0) {
+ avpriv_request_sample(s, "block_align invalid");
return AVERROR_INVALIDDATA;
}
st->codecpar->block_align *= st->codecpar->channels;
return 0;
}
-AVInputFormat ff_dsf_demuxer = {
+const AVInputFormat ff_dsf_demuxer = {
.name = "dsf",
.long_name = NULL_IF_CONFIG_SMALL("DSD Stream File (DSF)"),
.priv_data_size = sizeof(DSFContext),