diff options
| author | Martin Storsjö <martin@martin.st> | 2010-10-08 08:50:29 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-10-08 08:50:29 +0000 |
| commit | 9e6acc7884ee58e59bd63f681cf8fe2ee5cebfba (patch) | |
| tree | 46e057aaebf8c025c529515449017f8bafed4e69 | |
| parent | f6833fc1c68f119d266075dcfd729ff4440ac864 (diff) | |
| download | ffmpeg-9e6acc7884ee58e59bd63f681cf8fe2ee5cebfba.tar.gz | |
rtsp: Remove the start_time field from RTSPState, use AVFormatContext->start_time_realtime instead
Originally committed as revision 25408 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/rtsp.c | 5 | ||||
| -rw-r--r-- | libavformat/rtsp.h | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index bdbc7ebb74..6ddf149582 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -505,7 +505,6 @@ void ff_rtsp_close_streams(AVFormatContext *s) static void *rtsp_rtp_mux_open(AVFormatContext *s, AVStream *st, URLContext *handle) { - RTSPState *rt = s->priv_data; AVFormatContext *rtpctx; int ret; AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL); @@ -529,7 +528,7 @@ static void *rtsp_rtp_mux_open(AVFormatContext *s, AVStream *st, rtpctx->streams[0]->sample_aspect_ratio = st->sample_aspect_ratio; /* Set the synchronized start time. */ - rtpctx->start_time_realtime = rt->start_time; + rtpctx->start_time_realtime = s->start_time_realtime; /* Remove the local codec, link to the original codec * context instead, to give the rtp muxer access to @@ -1333,7 +1332,7 @@ static int rtsp_setup_output_streams(AVFormatContext *s, const char *addr) char *sdp; AVFormatContext sdp_ctx, *ctx_array[1]; - rt->start_time = av_gettime(); + s->start_time_realtime = av_gettime(); /* Announce the stream */ sdp = av_mallocz(SDP_MAX_SIZE); diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 3d2c67818e..3e426a07b7 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -295,9 +295,6 @@ typedef struct RTSPState { * other cases, this is a copy of AVFormatContext->filename. */ char control_uri[1024]; - /** The synchronized start time of the output streams. */ - int64_t start_time; - /** Additional output handle, used when input and output are done * separately, eg for HTTP tunneling. */ URLContext *rtsp_hd_out; |