diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-03-14 23:52:45 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-03-14 23:52:45 +0200 |
| commit | ae2faad6669c313b7a5dd318baeee0bffdd47031 (patch) | |
| tree | 0b383b5dde56d54be4b144e7e23e96bd8bdd43cf /stream | |
| parent | b93f4b7bba0e31d157b74685d3166f74a6c244d7 (diff) | |
| parent | 642162c07460e439d1d81cda4643dc028ed238e0 (diff) | |
| download | mpv-ae2faad6669c313b7a5dd318baeee0bffdd47031.tar.bz2 mpv-ae2faad6669c313b7a5dd318baeee0bffdd47031.tar.xz | |
Merge svn changes up to r28951
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/freesdp/parser.c | 2 | ||||
| -rw-r--r-- | stream/librtsp/rtsp_rtp.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/stream/freesdp/parser.c b/stream/freesdp/parser.c index c17041b7ba..bf6f985e94 100644 --- a/stream/freesdp/parser.c +++ b/stream/freesdp/parser.c @@ -1644,7 +1644,7 @@ const char * fsdp_get_media_format (const fsdp_media_description_t * dsc, unsigned int index) { - if (!dsc || (index < dsc->formats_count)) + if (!dsc || (index < dsc->formats_count - 1)) return NULL; return dsc->formats[index]; } diff --git a/stream/librtsp/rtsp_rtp.c b/stream/librtsp/rtsp_rtp.c index 0c00e5b454..66c7be4a36 100644 --- a/stream/librtsp/rtsp_rtp.c +++ b/stream/librtsp/rtsp_rtp.c @@ -507,7 +507,8 @@ rtp_setup_and_play (rtsp_t *rtsp_session) } /* only MPEG-TS is supported at the moment */ - if (!strstr (fsdp_get_media_format (med_dsc, 0), + if (!fsdp_get_media_format (med_dsc, 0) || + !strstr (fsdp_get_media_format (med_dsc, 0), RTSP_MEDIA_CONTAINER_MPEG_TS)) { fsdp_description_delete (dsc); |