X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Friffdec.c;h=b448f9116fd84c4d5451bd1280a464fa3bbcdbbf;hb=82cddf6374017aca4e893f354ab01f05f14a60b5;hp=656a9ebcf8d08d25c61f555833c7b51760b4ac63;hpb=14194090a6f65c5110689944c91a6b9030c65791;p=ffmpeg diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index 656a9ebcf8d..b448f9116fd 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -208,11 +208,12 @@ enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps) return id; } -int ff_get_bmp_header(AVIOContext *pb, AVStream *st, unsigned *esize) +int ff_get_bmp_header(AVIOContext *pb, AVStream *st, uint32_t *size) { int tag1; - if(esize) *esize = avio_rl32(pb); - else avio_rl32(pb); + uint32_t size_ = avio_rl32(pb); + if (size) + *size = size_; st->codecpar->width = avio_rl32(pb); st->codecpar->height = (int32_t)avio_rl32(pb); avio_rl16(pb); /* planes */