diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2008-09-11 17:43:44 +0000 |
---|---|---|
committer | Ronald S. Bultje <rsbultje@gmail.com> | 2008-09-11 17:43:44 +0000 |
commit | a6789dca1bd8fc9c9538889f661ee83239c5aeb4 (patch) | |
tree | d3d9edb1bba830380c3e99c97bc860ec471b0f0c /libavformat | |
parent | ee0cb67fa3a761a83674412b45ef8ea8bb124366 (diff) | |
download | ffmpeg-a6789dca1bd8fc9c9538889f661ee83239c5aeb4.tar.gz |
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
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/rtsp.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 22ecaef711..5718a0f1dc 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -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); - - 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; - } + /* 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; } + } return 0; } |