Also support NULL for --conn parameters

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

diff --git a/rtmpdump.c b/rtmpdump.c
index e83770965f9697eeb60ffa8f961e0ffe390baedc..a8fba7154cdfc46000cad1f9ad87034ff35c87dc 100644 (file)
--- a/rtmpdump.c
+++ b/rtmpdump.c
@@ -1074,6 +1074,9 @@ parseAMF(AMFObject *obj, const char *arg, int *depth)
           prop.p_type = AMF_NUMBER;
           prop.p_vu.p_number = strtod(p, NULL);
           break;
+        case 'Z':
+          prop.p_type = AMF_NULL;
+          break;
         case 'O':
           i = atoi(p);
           if (i)
@@ -1320,7 +1323,7 @@ main(int argc, char **argv)
          LogPrintf
            ("                        B:boolean(0|1), S:string, N:number, O:object-flag(0|1),\n");
          LogPrintf
-           ("                        NB:name:boolean, NS:name:string, NN:name:number\n");
+           ("                        Z:(null), NB:name:boolean, NS:name:string, NN:name:number\n");
          LogPrintf
            ("--flashVer|-f string    Flash version string (default: \"%s\")\n",
             DEFAULT_FLASH_VER);

diff --git a/rtmpsrv.c b/rtmpsrv.c
index 9a3f861dffdf3826e6e729e6be20ae0a15c59916..caeb76383bd52d9eb98b9cd94f4b6aef1f94f6b2 100644 (file)
--- a/rtmpsrv.c
+++ b/rtmpsrv.c
@@ -245,7 +245,7 @@ static void
 dumpAMF(AMFObject *obj)
 {
    int i;
-   const char opt[] = "NBSO";
+   const char opt[] = "NBSO Z";
 
    for (i=0; i < obj->o_num; i++)
      {
@@ -272,6 +272,8 @@ dumpAMF(AMFObject *obj)
            dumpAMF(&p->p_vu.p_object);
            LogPrintf(" -C O:0");
            break;
+         case AMF_NULL:
+           break;
          default:
            LogPrintf("<type %d>", p->p_type);
          }

diff --git a/streams.c b/streams.c
index ccf53bf5b8431c6d10d0124570a97655a07da130..ece3f127cdb01339bedfb546d0ec01d666ec7463 100644 (file)
--- a/streams.c
+++ b/streams.c
@@ -131,6 +131,9 @@ parseAMF(AMFObject *obj, const char *arg, int *depth)
           prop.p_type = AMF_NUMBER;
           prop.p_vu.p_number = strtod(p, NULL);
           break;
+        case 'Z':
+          prop.p_type = AMF_NULL;
+          break;
         case 'O':
           i = atoi(p);
           if (i)
@@ -1251,7 +1254,7 @@ main(int argc, char **argv)
          LogPrintf
            ("                        B:boolean(0|1), S:string, N:number, O:object-flag(0|1),\n");
          LogPrintf
-           ("                        NB:name:boolean, NS:name:string, NN:name:number\n");
+           ("                        Z:(null), NB:name:boolean, NS:name:string, NN:name:number\n");
          LogPrintf
            ("--flashVer|-f string    Flash version string (default: \"%s\")\n",
             DEFAULT_FLASH_VER);