]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
simplify, use ist
authorbcoudurier <bcoudurier@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Mon, 23 Jun 2008 03:18:24 +0000 (03:18 +0000)
committerbcoudurier <bcoudurier@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Mon, 23 Jun 2008 03:18:24 +0000 (03:18 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13903 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

ffserver.c

index c89cb52e9d2771fae2831b649b6112d103e5ccb9..f91e1934ed95e456cef2f289bc017df324e18445 100644 (file)
@@ -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,