virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

rtsp: Remove the start_time field from RTSPState, use AVFormatContext->start_time_realtime instead

Browse Source 
Originally committed as revision 25408 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-10-08 08:50:29 +00:00
parent f6833fc1c6
commit 9e6acc7884
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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,
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);

3
libavformat/rtsp.h
View File

@ -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;