diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2011-01-28 03:12:22 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-30 03:40:59 +0100 |
commit | b351baa070beede5d110974544782ac80e21bc90 (patch) | |
tree | fb0d13bfb7cdca18103ed4f1725a42b8ec9eccb0 /libavformat/rtsp.c | |
parent | d0eb91ad0451cdb6c062b2d4760bfa7f8bb4db6b (diff) |
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)
Diffstat (limited to 'libavformat/rtsp.c')
-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 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++) { |