From b351baa070beede5d110974544782ac80e21bc90 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Fri, 28 Jan 2011 03:12:22 +0100 Subject: rtsp: make ff_sdp_parse return value forwarded the sdp demuxer did not forward it at all while the rtsp demuxer assumed a single kind of error (cherry picked from commit f81c7ac70a7e5e82b0ab0839faf8d22d555efb9d) --- libavformat/rtsp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavformat/rtsp.c') diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index a56ff99547..dec6995c46 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1795,8 +1795,9 @@ static int sdp_read_header(AVFormatContext *s, AVFormatParameters *ap) } content[size] ='\0'; - ff_sdp_parse(s, content); + err = ff_sdp_parse(s, content); av_free(content); + if (err) goto fail; /* open each RTP stream */ for (i = 0; i < rt->nb_rtsp_streams; i++) { -- cgit v1.2.3