Skip to content

F
ffmpeg
Commit 251329fa authored by Paul B Mahol's avatar Paul B Mahol
Browse files
Options

avformat/bink: move code for skipping unknown fields to correct place

parent 3735d55a
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
libavformat/bink.c
View file @ 251329fa
......@@ -92,6 +92,8 @@ static int read_header(AVFormatContext *s)
uint16_t flags;
int keyframe;
int ret;
uint32_t signature;
uint8_t revision;
vst = avformat_new_stream(s, NULL);
if (!vst)
......@@ -160,14 +162,14 @@ static int read_header(AVFormatContext *s)
return AVERROR(EIO);
}
if (bink->num_audio_tracks) {
uint32_t signature = (vst->codecpar->codec_tag & 0xFFFFFF);
uint8_t revision = ((vst->codecpar->codec_tag >> 24) % 0xFF);
signature = (vst->codecpar->codec_tag & 0xFFFFFF);
revision = ((vst->codecpar->codec_tag >> 24) % 0xFF);
if ((signature == AV_RL32("BIK") && (revision == 0x6b)) || /* k */
(signature == AV_RL32("KB2") && (revision == 0x69 || revision == 0x6a || revision == 0x6b))) /* i,j,k */
avio_skip(pb, 4); /* unknown new field */
if ((signature == AV_RL32("BIK") && (revision == 'k')) ||
(signature == AV_RL32("KB2") && (revision == 'i' || revision == 'j' || revision == 'k')))
avio_skip(pb, 4); /* unknown new field */
if (bink->num_audio_tracks) {
avio_skip(pb, 4 * bink->num_audio_tracks); /* max decoded size */
for (i = 0; i < bink->num_audio_tracks; i++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment