diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-23 03:18:24 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-23 03:18:24 +0000 |
| commit | 8f56ccca92a6e3c758563aaedf9bba0344c6f1fb (patch) | |
| tree | 28b1297728097f67c9cd3dcb139e3619556669c0 | |
| parent | 250be719e48532bd924636ead5209ffb81ddb880 (diff) | |
| download | ffmpeg-8f56ccca92a6e3c758563aaedf9bba0344c6f1fb.tar.gz | |
simplify, use ist
Originally committed as revision 13903 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | ffserver.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ffserver.c b/ffserver.c index c89cb52e9d..f91e1934ed 100644 --- a/ffserver.c +++ b/ffserver.c @@ -2166,13 +2166,11 @@ static int http_prepare_data(HTTPContext *c) output stream (one for each RTP connection). XXX: need more abstract handling */ if (c->is_packetized) { - AVStream *st; /* compute send time and duration */ - st = c->fmt_in->streams[source_index]; - c->cur_pts = av_rescale_q(pkt.dts, st->time_base, AV_TIME_BASE_Q); - if (st->start_time != AV_NOPTS_VALUE) - c->cur_pts -= av_rescale_q(st->start_time, st->time_base, AV_TIME_BASE_Q); - c->cur_frame_duration = av_rescale_q(pkt.duration, st->time_base, AV_TIME_BASE_Q); + c->cur_pts = av_rescale_q(pkt.dts, ist->time_base, AV_TIME_BASE_Q); + if (ist->start_time != AV_NOPTS_VALUE) + c->cur_pts -= av_rescale_q(ist->start_time, ist->time_base, AV_TIME_BASE_Q); + c->cur_frame_duration = av_rescale_q(pkt.duration, ist->time_base, AV_TIME_BASE_Q); #if 0 printf("index=%d pts=%0.3f duration=%0.6f\n", pkt.stream_index, |