Browse Source

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
tags/n0.8
Luca Barbato 14 years ago
parent
commit
f81c7ac70a
2 changed files with 3 additions and 2 deletions
  1. +2
    -1
      libavformat/rtsp.c
  2. +1
    -1
      libavformat/rtspdec.c

+ 2
- 1
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++) {


+ 1
- 1
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;
}


Loading…
Cancel
Save