From e90820d4f815c15796e642467cdddbad755212a2 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Wed, 23 Jan 2013 21:38:41 +0200 Subject: rtp: Make sure priv_data is set before reading it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes crashes with muxing H263 into RTSP. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö --- libavformat/rtp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/rtp.c') diff --git a/libavformat/rtp.c b/libavformat/rtp.c index dfe97dec97..d1c6ed09aa 100644 --- a/libavformat/rtp.c +++ b/libavformat/rtp.c @@ -104,7 +104,7 @@ int ff_rtp_get_payload_type(AVFormatContext *fmt, for (i = 0; rtp_payload_types[i].pt >= 0; ++i) if (rtp_payload_types[i].codec_id == codec->codec_id) { if (codec->codec_id == AV_CODEC_ID_H263 && (!fmt || - !fmt->oformat->priv_class || + !fmt->oformat->priv_class || !fmt->priv_data || !av_opt_flag_is_set(fmt->priv_data, "rtpflags", "rfc2190"))) continue; /* G722 has 8000 as nominal rate even if the sample rate is 16000, -- cgit v1.2.3