generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tta: Fix framepos and start_offset types

Browse Source 
Also propagate errors.

CC: libav-stable@libav.org
Bug-Id: CID 1238812
This commit is contained in:
Vittorio Giovara 2015-02-02 07:21:30 +01:00
parent a6653787a4
commit ec524ed12a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/tta.c
View File

@ -45,12 +45,14 @@ static int tta_read_header(AVFormatContext *s)
TTAContext *c = s->priv_data; TTAContext *c = s->priv_data;
AVStream *st; AVStream *st;
int i, channels, bps, samplerate, datalen; int i, channels, bps, samplerate, datalen;
uint64_t framepos, start_offset; int64_t framepos, start_offset;
if (!av_dict_get(s->metadata, "", NULL, AV_DICT_IGNORE_SUFFIX)) if (!av_dict_get(s->metadata, "", NULL, AV_DICT_IGNORE_SUFFIX))
ff_id3v1_read(s); ff_id3v1_read(s);
start_offset = avio_tell(s->pb); start_offset = avio_tell(s->pb);
if (start_offset < 0)
return start_offset;
if (avio_rl32(s->pb) != AV_RL32("TTA1")) if (avio_rl32(s->pb) != AV_RL32("TTA1"))
return -1; // not tta file return -1; // not tta file
@ -91,7 +93,10 @@ static int tta_read_header(AVFormatContext *s)
st->start_time = 0; st->start_time = 0;
st->duration = datalen; st->duration = datalen;
framepos = avio_tell(s->pb) + 4*c->totalframes + 4; framepos = avio_tell(s->pb);
if (framepos < 0)
return framepos;
framepos += 4 * c->totalframes + 4;
for (i = 0; i < c->totalframes; i++) { for (i = 0; i < c->totalframes; i++) {
uint32_t size = avio_rl32(s->pb); uint32_t size = avio_rl32(s->pb);