mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
remove duplicate code" thread on ML. Originally committed as revision 15298 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
ee0cb67fa3
commit
a6789dca1b
@ -873,21 +873,21 @@ rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st)
|
||||
{
|
||||
AVStream *st = NULL;
|
||||
|
||||
/* open the RTP context */
|
||||
if (rtsp_st->stream_index >= 0)
|
||||
st = s->streams[rtsp_st->stream_index];
|
||||
if (!st)
|
||||
s->ctx_flags |= AVFMTCTX_NOHEADER;
|
||||
rtsp_st->rtp_ctx = rtp_parse_open(s, st, rtsp_st->rtp_handle, rtsp_st->sdp_payload_type, &rtsp_st->rtp_payload_data);
|
||||
/* open the RTP context */
|
||||
if (rtsp_st->stream_index >= 0)
|
||||
st = s->streams[rtsp_st->stream_index];
|
||||
if (!st)
|
||||
s->ctx_flags |= AVFMTCTX_NOHEADER;
|
||||
rtsp_st->rtp_ctx = rtp_parse_open(s, st, rtsp_st->rtp_handle, rtsp_st->sdp_payload_type, &rtsp_st->rtp_payload_data);
|
||||
|
||||
if (!rtsp_st->rtp_ctx) {
|
||||
return AVERROR(ENOMEM);
|
||||
} else {
|
||||
if(rtsp_st->dynamic_handler) {
|
||||
rtsp_st->rtp_ctx->dynamic_protocol_context= rtsp_st->dynamic_protocol_context;
|
||||
rtsp_st->rtp_ctx->parse_packet= rtsp_st->dynamic_handler->parse_packet;
|
||||
}
|
||||
if (!rtsp_st->rtp_ctx) {
|
||||
return AVERROR(ENOMEM);
|
||||
} else {
|
||||
if(rtsp_st->dynamic_handler) {
|
||||
rtsp_st->rtp_ctx->dynamic_protocol_context= rtsp_st->dynamic_protocol_context;
|
||||
rtsp_st->rtp_ctx->parse_packet= rtsp_st->dynamic_handler->parse_packet;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user