On Sat, 19 May 2012, Luca Barbato wrote:
The application component can have a subcomponent to specify the application instance even if it doesn't have a ":" in the playpath. --- doc/protocols.texi | 2 +- libavformat/rtmpproto.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)diff --git a/doc/protocols.texi b/doc/protocols.texi index b08233e..9ac5151 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -164,7 +164,7 @@ content across a TCP/IP network. The required syntax is: @example -rtmp://@var{server}[:@var{port}][/@var{app}][/@var{playpath}] +rtmp://@var{server}[:@var{port}][/@var{app}][/@var{instance}][/@var{playpath}] @end example The accepted parameters are: diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 1b86c44..8fc390c 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -901,9 +901,10 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) fname = next; rt->app[0] = '\0'; } else { + // make sure we do not mismatch a playpath for an application instance char *c = strchr(p + 1, ':'); fname = strchr(p + 1, '/'); - if (!fname || c < fname) { + if (!fname || (c && c < fname)) { fname = p + 1; av_strlcpy(rt->app, path + 1, p - path); } else { -- 1.7.8.rc1
Ok // Martin _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
