Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

10l forgot to set packet_size

Browse source 
Originally committed as revision 5086 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-03-01 15:21:53 +00:00
parent 1894edeb74
commit 8223bca50d
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libavformat/avidec.c
View file

@ -34,7 +34,7 @@ typedef struct AVIStream {
int scale; int scale;
int rate; int rate;
int sample_size; /* audio only data */ int sample_size; /* size of one sample (or packet) (in the rate/scale sense) in bytes */
int start; int start;
int64_t cum_len; /* temporary storage (used during seek) */ int64_t cum_len; /* temporary storage (used during seek) */
@ -474,8 +474,11 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
url_fseek(&s->pb, pos + 8, SEEK_SET); url_fseek(&s->pb, pos + 8, SEEK_SET);
// av_log(NULL, AV_LOG_DEBUG, "pos=%Ld\n", pos); // av_log(NULL, AV_LOG_DEBUG, "pos=%Ld\n", pos);
assert(best_ast->remaining <= best_ast->packet_size);
avi->stream_index= best_stream_index; avi->stream_index= best_stream_index;
if(!best_ast->remaining) if(!best_ast->remaining)
best_ast->packet_size=
best_ast->remaining= best_st->index_entries[i].size; best_ast->remaining= best_st->index_entries[i].size;
} }
} }
@ -509,7 +512,7 @@ resync:
// pkt->dts += ast->start; // pkt->dts += ast->start;
if(ast->sample_size) if(ast->sample_size)
pkt->dts /= ast->sample_size; pkt->dts /= ast->sample_size;
//av_log(NULL, AV_LOG_DEBUG, "dts:%Ld offset:%d %d/%d smpl_siz:%d base:%d st:%d size:%d\n", pkt->dts, ast->frame_offset, ast->scale, ast->rate, ast->sample_size, AV_TIME_BASE, n, size); //av_log(NULL, AV_LOG_DEBUG, "dts:%Ld offset:%Ld %d/%d smpl_siz:%d base:%d st:%d size:%d\n", pkt->dts, ast->frame_offset, ast->scale, ast->rate, ast->sample_size, AV_TIME_BASE, avi->stream_index, size);
pkt->stream_index = avi->stream_index; pkt->stream_index = avi->stream_index;
if (st->codec->codec_type == CODEC_TYPE_VIDEO) { if (st->codec->codec_type == CODEC_TYPE_VIDEO) {