From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Date: Sun, 14 Mar 2010 04:30:24 +0000 (+0000)
Subject: Rever -r343, app is not required
X-Git-Tag: v2.4~189
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9abae8295606acfce2e476a3eadaf92638607c31;p=rtmpdump

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 726e85f..b3ce51d 100644
--- 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 7a783c5..b0f585b 100644
--- 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)