riffdec.c (libav-12) | : | riffdec.c (libav-12.1) | ||
---|---|---|---|---|
skipping to change at line 183 | skipping to change at line 183 | |||
if (id == AV_CODEC_ID_PCM_S16LE) | if (id == AV_CODEC_ID_PCM_S16LE) | |||
id = ff_get_pcm_codec_id(bps, 0, 0, ~1); | id = ff_get_pcm_codec_id(bps, 0, 0, ~1); | |||
else if (id == AV_CODEC_ID_PCM_F32LE) | else if (id == AV_CODEC_ID_PCM_F32LE) | |||
id = ff_get_pcm_codec_id(bps, 1, 0, 0); | id = ff_get_pcm_codec_id(bps, 1, 0, 0); | |||
if (id == AV_CODEC_ID_ADPCM_IMA_WAV && bps == 8) | if (id == AV_CODEC_ID_ADPCM_IMA_WAV && bps == 8) | |||
id = AV_CODEC_ID_PCM_ZORK; | id = AV_CODEC_ID_PCM_ZORK; | |||
return id; | return id; | |||
} | } | |||
int ff_get_bmp_header(AVIOContext *pb, AVStream *st) | int ff_get_bmp_header(AVIOContext *pb, AVStream *st, uint32_t *size) | |||
{ | { | |||
int tag1; | int tag1; | |||
avio_rl32(pb); /* size */ | uint32_t size_ = avio_rl32(pb); | |||
if (size) | ||||
*size = size_; | ||||
st->codecpar->width = avio_rl32(pb); | st->codecpar->width = avio_rl32(pb); | |||
st->codecpar->height = (int32_t)avio_rl32(pb); | st->codecpar->height = (int32_t)avio_rl32(pb); | |||
avio_rl16(pb); /* planes */ | avio_rl16(pb); /* planes */ | |||
st->codecpar->bits_per_coded_sample = avio_rl16(pb); /* depth */ | st->codecpar->bits_per_coded_sample = avio_rl16(pb); /* depth */ | |||
tag1 = avio_rl32(pb); | tag1 = avio_rl32(pb); | |||
avio_rl32(pb); /* ImageSize */ | avio_rl32(pb); /* ImageSize */ | |||
avio_rl32(pb); /* XPelsPerMeter */ | avio_rl32(pb); /* XPelsPerMeter */ | |||
avio_rl32(pb); /* YPelsPerMeter */ | avio_rl32(pb); /* YPelsPerMeter */ | |||
avio_rl32(pb); /* ClrUsed */ | avio_rl32(pb); /* ClrUsed */ | |||
avio_rl32(pb); /* ClrImportant */ | avio_rl32(pb); /* ClrImportant */ | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 4 lines changed or added |