mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-03 14:32:16 +02:00
Merge commit '0638b99cdba52554691fc668d9e477bc184c7a33'
* commit '0638b99cdba52554691fc668d9e477bc184c7a33': aiff: Skip padding byte for odd-sized chunks Also removes to odd-size checks from get_aiff_header and get_meta to use the generic path introduced by the original commit. Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
This commit is contained in:
commit
e2adbcbd97
@ -330,10 +330,14 @@ static int aiff_read_header(AVFormatContext *s)
|
||||
if (offset > 0 && st->codecpar->block_align) // COMM && SSND
|
||||
goto got_sound;
|
||||
default: /* Jump */
|
||||
if (size & 1) /* Always even aligned */
|
||||
size++;
|
||||
avio_skip(pb, size);
|
||||
}
|
||||
|
||||
/* Skip required padding byte for odd-sized chunks. */
|
||||
if (size & 1) {
|
||||
filesize--;
|
||||
avio_skip(pb, 1);
|
||||
}
|
||||
}
|
||||
|
||||
got_sound:
|
||||
|
Loading…
x
Reference in New Issue
Block a user