virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

better handling of partial files

Browse Source 
Originally committed as revision 5668 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2006-07-08 12:58:50 +00:00
parent b72708f8f3
commit 1f1890c754
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mov.c
View File

@ -1750,9 +1750,9 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
assert(chunk_duration % sc->time_rate == 0); assert(chunk_duration % sc->time_rate == 0);
current_dts += chunk_duration / sc->time_rate; current_dts += chunk_duration / sc->time_rate;
} }
/* adjust sample count to chunk count */
sc->sample_count = sc->chunk_count;
} }
/* adjust sample count to avindex entries */
sc->sample_count = st->nb_index_entries;
} }
static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap) static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
@ -1842,11 +1842,12 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
return -1; return -1;
/* must be done just before reading, to avoid infinite loop on sample */ /* must be done just before reading, to avoid infinite loop on sample */
sc->current_sample++; sc->current_sample++;
url_fseek(&s->pb, sample->pos, SEEK_SET); if (sample->pos >= url_fsize(&s->pb)) {
if (av_get_packet(&s->pb, pkt, sample->size) <= 0) { av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%llx: partial file\n", sc->ffindex, sample->pos);
av_log(s, AV_LOG_ERROR, "stream %d, error reading packet at offset 0x%llx, maybe partial file\n", sc->ffindex, sample->pos);
return -1; return -1;
} }
url_fseek(&s->pb, sample->pos, SEEK_SET);
av_get_packet(&s->pb, pkt, sample->size);
pkt->stream_index = sc->ffindex; pkt->stream_index = sc->ffindex;
pkt->dts = sample->timestamp; pkt->dts = sample->timestamp;
if (sc->ctts_data) { if (sc->ctts_data) {