From f475f35fdd0bb3c15737609352c69bc352c8ec15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Thu, 3 Jun 2010 20:58:22 +0000
Subject: [PATCH] ffserver: Calculate cur_pts using first_pts as origin instead
 of ist->start_time

This fixes cases where ist->start_time wasn't initialized. This also makes
cur_pts calculated against the same origin for all streams.

Originally committed as revision 23450 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 ffserver.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ffserver.c b/ffserver.c
index 7af4938fe4..6d1e710c6a 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2368,8 +2368,7 @@ static int http_prepare_data(HTTPContext *c)
                     if (c->is_packetized) {
                         /* compute send time and duration */
                         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_pts -= c->first_pts;
                         c->cur_frame_duration = av_rescale_q(pkt.duration, ist->time_base, AV_TIME_BASE_Q);
                         /* find RTP context */
                         c->packet_stream_index = pkt.stream_index;