Rever -r343, app is not required

git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@349 400ebc74-4327-4243-bc38-086b20814532

diff --git a/rtmpdump.c b/rtmpdump.c
index 726e85f5e0416a3234d5991b17e9a10fe3f5c47a..b3ce51d8be422e969564f7ac91696d533d499bc8 100644 (file)
--- a/rtmpdump.c
+++ b/rtmpdump.c
@@ -1129,19 +1129,13 @@ main(int argc, char **argv)
   if (hostname == 0)
     {
       Log(LOGERROR,
-         "You must specify a hostname (--host) or url (-r \"rtmp://host[:port]/app/playpath\") containing a hostname");
+         "You must specify a hostname (--host) or url (-r \"rtmp://host[:port]/playpath\") containing a hostname");
       return RD_FAILED;
     }
   if (playpath.av_len == 0)
     {
       Log(LOGERROR,
-         "You must specify a playpath (--playpath) or url (-r \"rtmp://host[:port]/app/playpath\") containing a playpath");
-      return RD_FAILED;
-    }
-  if (app.av_len == 0)
-    {
-      Log(LOGERROR,
-         "You must specify an app (--app) or url (-r \"rtmp://host[:port]/app/playpath\") containing an app");
+         "You must specify a playpath (--playpath) or url (-r \"rtmp://host[:port]/playpath\") containing a playpath");
       return RD_FAILED;
     }
 
@@ -1213,7 +1207,7 @@ main(int argc, char **argv)
     }
 #endif
 
-  if (tcUrl.av_len == 0)
+  if (tcUrl.av_len == 0 && app.av_len != 0)
     {
       char str[512] = { 0 };
 

diff --git a/rtmpgw.c b/rtmpgw.c
index 7a783c52dae2b697499bbd0885b9a849fec39c9d..b0f585b88ed84bbc4fdf755f5961ba02bef8b3b7 100644 (file)
--- a/rtmpgw.c
+++ b/rtmpgw.c
@@ -465,23 +465,16 @@ void processTCPrequest(STREAMING_SERVER * server, // server socket and state (ou
   if (req.hostname == 0)
     {
       Log(LOGERROR,
-         "You must specify a hostname (--host) or url (-r \"rtmp://host[:port]/app/playpath\") containing a hostname");
+         "You must specify a hostname (--host) or url (-r \"rtmp://host[:port]/playpath\") containing a hostname");
       status = "400 Missing Hostname";
       goto filenotfound;
     }
   if (req.playpath.av_len == 0)
     {
       Log(LOGERROR,
-         "You must specify a playpath (--playpath) or url (-r \"rtmp://host[:port]/app/playpath\") containing a playpath");
+         "You must specify a playpath (--playpath) or url (-r \"rtmp://host[:port]/playpath\") containing a playpath");
       status = "400 Missing Playpath";
-      goto filenotfound;
-    }
-  if (req.app.av_len == 0)
-    {
-      Log(LOGERROR,
-         "You must specify an app (--app) or url (-r \"rtmp://host[:port]/app/playpath\") containing an app");
-      status = "400 Missing App";
-      goto filenotfound;
+      goto filenotfound;;
     }
 
   if (req.protocol == RTMP_PROTOCOL_UNDEFINED)