Browse Source

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
tags/n0.8
Martin Storsjö 15 years ago
parent
commit
9e6acc7884
2 changed files with 2 additions and 6 deletions
  1. +2
    -3
      libavformat/rtsp.c
  2. +0
    -3
      libavformat/rtsp.h

+ 2
- 3
libavformat/rtsp.c View File

@@ -505,7 +505,6 @@ void ff_rtsp_close_streams(AVFormatContext *s)
static void *rtsp_rtp_mux_open(AVFormatContext *s, AVStream *st, static void *rtsp_rtp_mux_open(AVFormatContext *s, AVStream *st,
URLContext *handle) URLContext *handle)
{ {
RTSPState *rt = s->priv_data;
AVFormatContext *rtpctx; AVFormatContext *rtpctx;
int ret; int ret;
AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL); 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; rtpctx->streams[0]->sample_aspect_ratio = st->sample_aspect_ratio;


/* Set the synchronized start time. */ /* 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 /* Remove the local codec, link to the original codec
* context instead, to give the rtp muxer access to * 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; char *sdp;
AVFormatContext sdp_ctx, *ctx_array[1]; AVFormatContext sdp_ctx, *ctx_array[1];


rt->start_time = av_gettime();
s->start_time_realtime = av_gettime();


/* Announce the stream */ /* Announce the stream */
sdp = av_mallocz(SDP_MAX_SIZE); sdp = av_mallocz(SDP_MAX_SIZE);


+ 0
- 3
libavformat/rtsp.h View File

@@ -295,9 +295,6 @@ typedef struct RTSPState {
* other cases, this is a copy of AVFormatContext->filename. */ * other cases, this is a copy of AVFormatContext->filename. */
char control_uri[1024]; 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 /** Additional output handle, used when input and output are done
* separately, eg for HTTP tunneling. */ * separately, eg for HTTP tunneling. */
URLContext *rtsp_hd_out; URLContext *rtsp_hd_out;


Loading…
Cancel
Save