virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

rtsp: make ff_sdp_parse return value forwarded

Browse Source 
the sdp demuxer did not forward it at all while the rtsp demuxer assumed
a single kind of error
(cherry picked from commit f81c7ac70a)
This commit is contained in:
Luca Barbato 2011-01-28 03:12:22 +01:00 committed by Michael Niedermayer
parent d0eb91ad04
commit b351baa070
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/rtsp.c
View File

@ -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++) {

2
libavformat/rtspdec.c
View File

@ -136,7 +136,7 @@ int ff_rtsp_setup_input_streams(AVFormatContext *s, RTSPMessageHeader *reply)
ret = ff_sdp_parse(s, (const char *)content);
av_freep(&content);
if (ret < 0)
return AVERROR_INVALIDDATA;
return ret;
return 0;
}