virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit 'ec524ed12aa1aeb37125203f1adf5aa10dfcb0de'

Browse Source 
* commit 'ec524ed12aa1aeb37125203f1adf5aa10dfcb0de':
  tta: Fix framepos and start_offset types

Conflicts:
	libavformat/tta.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-02-03 23:49:14 +01:00
parent 1dc1c4e7a8 ec524ed12a
commit bd12634d6b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/tta.c
View File

@@ -56,12 +56,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; int i, channels, bps, samplerate;
uint64_t framepos, start_offset; int64_t framepos, start_offset;
uint32_t nb_samples, crc; uint32_t nb_samples, crc;
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;
ffio_init_checksum(s->pb, tta_check_crc, UINT32_MAX); ffio_init_checksum(s->pb, tta_check_crc, UINT32_MAX);
if (avio_rl32(s->pb) != AV_RL32("TTA1")) if (avio_rl32(s->pb) != AV_RL32("TTA1"))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@@ -107,7 +109,10 @@ static int tta_read_header(AVFormatContext *s)
st->start_time = 0; st->start_time = 0;
st->duration = nb_samples; st->duration = nb_samples;
framepos = avio_tell(s->pb) + 4*c->totalframes + 4; framepos = avio_tell(s->pb);
if (framepos < 0)
return framepos;
framepos += 4 * c->totalframes + 4;
if (ff_alloc_extradata(st->codec, avio_tell(s->pb) - start_offset)) if (ff_alloc_extradata(st->codec, avio_tell(s->pb) - start_offset))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);