eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-18 13:00:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '0638b99cdba52554691fc668d9e477bc184c7a33'

Browse Source 
* 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:
Matthieu Bouron
2017-03-17 13:31:03 +01:00
parent 205b8fd078 0638b99cdb
commit e2adbcbd97
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/aiffdec.c
View File

@@ -330,10 +330,14 @@ static int aiff_read_header(AVFormatContext *s)
if (offset > 0 && st->codecpar->block_align) // COMM && SSND if (offset > 0 && st->codecpar->block_align) // COMM && SSND
goto got_sound; goto got_sound;
default: /* Jump */ default: /* Jump */
if (size & 1) /* Always even aligned */
size++;
avio_skip(pb, size); avio_skip(pb, size);
} }
/* Skip required padding byte for odd-sized chunks. */
if (size & 1) {
filesize--;
avio_skip(pb, 1);
}
} }
got_sound: got_sound: