This is cleaner and avoids an uninitialized variable warning with MSVC.tags/n2.4
@@ -109,10 +109,9 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size) | |||||
The lavc AAC decoder requires the data from the codec specific | The lavc AAC decoder requires the data from the codec specific | ||||
description as extradata input. */ | description as extradata input. */ | ||||
int strt, skip; | int strt, skip; | ||||
MOVAtom atom; | |||||
strt = avio_tell(pb); | strt = avio_tell(pb); | ||||
ff_mov_read_esds(s, pb, atom); | |||||
ff_mov_read_esds(s, pb); | |||||
skip = size - (avio_tell(pb) - strt); | skip = size - (avio_tell(pb) - strt); | ||||
if (skip < 0 || !st->codec->extradata || | if (skip < 0 || !st->codec->extradata || | ||||
st->codec->codec_id != AV_CODEC_ID_AAC) { | st->codec->codec_id != AV_CODEC_ID_AAC) { | ||||
@@ -215,7 +215,7 @@ void ff_mp4_parse_es_descr(AVIOContext *pb, int *es_id); | |||||
(tag) == MKTAG('A', 'V', 'i', 'n')) | (tag) == MKTAG('A', 'V', 'i', 'n')) | ||||
int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb, MOVAtom atom); | |||||
int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb); | |||||
enum AVCodecID ff_mov_get_lpcm_codec_id(int bps, int flags); | enum AVCodecID ff_mov_get_lpcm_codec_id(int bps, int flags); | ||||
int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries); | int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries); | ||||
@@ -543,7 +543,7 @@ static int mov_read_hdlr(MOVContext *c, AVIOContext *pb, MOVAtom atom) | |||||
return 0; | return 0; | ||||
} | } | ||||
int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb, MOVAtom atom) | |||||
int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb) | |||||
{ | { | ||||
AVStream *st; | AVStream *st; | ||||
int tag; | int tag; | ||||
@@ -567,7 +567,7 @@ int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb, MOVAtom atom) | |||||
static int mov_read_esds(MOVContext *c, AVIOContext *pb, MOVAtom atom) | static int mov_read_esds(MOVContext *c, AVIOContext *pb, MOVAtom atom) | ||||
{ | { | ||||
return ff_mov_read_esds(c->fc, pb, atom); | |||||
return ff_mov_read_esds(c->fc, pb); | |||||
} | } | ||||
static int mov_read_dac3(MOVContext *c, AVIOContext *pb, MOVAtom atom) | static int mov_read_dac3(MOVContext *c, AVIOContext *pb, MOVAtom atom) | ||||