highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/matroskadec: Simplify checks for cook and ATRAC3

Browse Source 
Some conditions which don't change and which can therefore be checked
in read_header() were instead rechecked upon parsing each block. This
has been changed.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2020-04-20 08:54:23 +02:00
parent bdaa98dd4a
commit 4b1c19a054
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/matroskadec.c
View File

@@ -2624,7 +2624,8 @@ static int matroska_parse_tracks(AVFormatContext *s)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
track->audio.sub_packet_size = ff_sipr_subpk_size[flavor]; track->audio.sub_packet_size = ff_sipr_subpk_size[flavor];
st->codecpar->bit_rate = sipr_bit_rate[flavor]; st->codecpar->bit_rate = sipr_bit_rate[flavor];
} else if (track->audio.sub_packet_size <= 0) } else if (track->audio.sub_packet_size <= 0 ||
track->audio.frame_size % track->audio.sub_packet_size)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
st->codecpar->block_align = track->audio.sub_packet_size; st->codecpar->block_align = track->audio.sub_packet_size;
extradata_offset = 78; extradata_offset = 78;
@@ -3138,7 +3139,7 @@ static int matroska_parse_rm_audio(MatroskaDemuxContext *matroska,
} }
memcpy(track->audio.buf + y * w, data, w); memcpy(track->audio.buf + y * w, data, w);
} else { } else {
if (size < sps * w / sps || h<=0 || w%sps) { if (size < w) {
av_log(matroska->ctx, AV_LOG_ERROR, av_log(matroska->ctx, AV_LOG_ERROR,
"Corrupt generic RM-style audio packet size\n"); "Corrupt generic RM-style audio packet size\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;