diff options
| author | Martin Storsjö <martin@martin.st> | 2016-09-15 14:21:38 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2016-09-15 16:07:45 +0300 |
| commit | df3795025337479a639cb3cd26c93a4e82ccd4db (patch) | |
| tree | 15f8c32a80f9f03db19cf1d0c5b6894a60c271ac | |
| parent | bdf7610eb266fd3de650040c97328791868abd82 (diff) | |
| download | ffmpeg-df3795025337479a639cb3cd26c93a4e82ccd4db.tar.gz | |
rtsp: Fix a crash with the RTSP muxer
This was introduced in bc2a32969e.
The whole block that the statement was added to is only
relevant when used as a demuxer, but the other statements
there have had other if statements guarding them. Make
sure to only run this whole block if being used as a
demuxer.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/rtsp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index b9416d2606..84b912f7f2 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -827,7 +827,8 @@ int ff_rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st) if (!rtsp_st->transport_priv) { return AVERROR(ENOMEM); - } else if (CONFIG_RTPDEC && rt->transport == RTSP_TRANSPORT_RTP) { + } else if (CONFIG_RTPDEC && rt->transport == RTSP_TRANSPORT_RTP && + s->iformat) { RTPDemuxContext *rtpctx = rtsp_st->transport_priv; rtpctx->ssrc = rtsp_st->ssrc; if (rtsp_st->dynamic_handler) { |