Vout: add a new vout_window type for android native windows

[vlc] / src / stream_output / sdp.c

diff --git a/src/stream_output/sdp.c b/src/stream_output/sdp.c
index ff33bbec512b3ecb5d23c71ffb3dee484bd5f04a..37c55b0eb2a12ab9adbbf6edc83bf4d031e18256 100644 (file)
--- a/src/stream_output/sdp.c
+++ b/src/stream_output/sdp.c
@@ -4,26 +4,26 @@
  * Copyright © 2007 Rémi Denis-Courmont
  * $Id$
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stddef.h>
 #include <string.h>
@@ -132,7 +132,7 @@ char *sdp_Start (const char *name, const char *description, const char *url,
     }
 
     if (asprintf (&sdp, "v=0"
-                    "\r\no=- "I64Fu" "I64Fu" IN IP%c %s"
+                    "\r\no=- %"PRIu64" %"PRIu64" IN IP%c %s"
                     "\r\ns=%s"
                     "\r\ni=%s"
                     "%s%s" // optional URL
@@ -270,10 +270,6 @@ char *vlc_sdp_Start (vlc_object_t *obj, const char *cfgpref,
     char varname[cfglen + sizeof ("description")], *subvar = varname + cfglen;
     strcpy (varname, cfgpref);
 
-    session_descriptor_t *p_session = calloc (1, sizeof (*p_session));
-    if (p_session == NULL)
-        return NULL;
-
     strcpy (subvar, "name");
     char *name = var_GetNonEmptyString (obj, varname);
     strcpy (subvar, "description");
@@ -296,13 +292,14 @@ char *vlc_sdp_Start (vlc_object_t *obj, const char *cfgpref,
     if (sdp == NULL)
         return NULL;
 
-    /* Totally non-standard */
-    strcpy (subvar, "group");
-    char *group = var_GetNonEmptyString (obj, varname);
-    if (group != NULL)
+    strcpy (subvar, "cat");
+    char *cat = var_GetNonEmptyString (obj, varname);
+    if (cat != NULL)
     {
-        sdp_AddAttribute (&sdp, "x-plgroup", "%s", group);
-        free (group);
+        sdp_AddAttribute (&sdp, "cat", "%s", cat);
+        /* Totally non-standard */
+        sdp_AddAttribute (&sdp, "x-plgroup", "%s", cat);
+        free (cat);
     }
 
     return sdp;