Fixes

diff --git a/src/stream_output/sdp.c b/src/stream_output/sdp.c
index 7cb4420ba500606b41b1cac575e958f3b9f5f4e1..51506dd5b8cad3c995fac7b2f8edf1576c8f22c0 100644 (file)
--- a/src/stream_output/sdp.c
+++ b/src/stream_output/sdp.c
@@ -12,7 +12,7 @@
  * 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
- * GNU General Public License for more details.
+ * 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
@@ -151,7 +151,7 @@ char *StartSDP (const char *name, const char *description, const char *url,
 }
 
 
-char *vMakeSDPMedia (const char *type, int dport, const char *protocol,
+char *vAddSDPMedia (const char *type, int dport, const char *protocol,
                     unsigned pt, const char *rtpmap,
                     const char *fmtpfmt, va_list ap)
 {
@@ -195,3 +195,15 @@ char *vMakeSDPMedia (const char *type, int dport, const char *protocol,
 
     return sdp_media;
 }
+
+
+char *AddSDPMedia (const char *type, int dport, const char *protocol,
+                    unsigned pt, const char *rtpmap, const char *fmtpfmt, ...)
+{
+    va_list ap;
+    char *ret;
+    va_start (ap, fmtpfmt);
+    ret = vAddSDPMedia (type, dport, protocol, pt, rtpmap, fmtpfmt, ap);
+    va_end (ap);
+    return ret;
+}

diff --git a/src/stream_output/stream_output.h b/src/stream_output/stream_output.h
index 837fc900b352dc8f94ffa5d76b5fa5c004e51564..9daebe300629f4fa4f7f07e988b405d933aa6c55 100644 (file)
--- a/src/stream_output/stream_output.h
+++ b/src/stream_output/stream_output.h
@@ -24,8 +24,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  ***************************************************************************/
 
-#include <vlc_sout.h>
-#include <vlc_network.h>
+#ifndef VLC_SRC_STREAMOUT_H
+# define VLC_SRC_STREAMOUT_H 1
+
+# include <vlc_sout.h>
+# include <vlc_network.h>
 
 /****************************************************************************
  * sout_packetizer_input_t: p_sout <-> p_packetizer
@@ -118,17 +121,12 @@ char *StartSDP (const char *name, const char *description, const char *url,
                 const char *email, const char *phone, vlc_bool_t ssm,
                 const struct sockaddr *orig, socklen_t origlen,
                 const struct sockaddr *addr, socklen_t addrlen);
-char *vMakeSDPMedia (const char *type, int dport, const char *protocol,
-                     unsigned pt, const char *rtpmap,
-                     const char *fmtp, va_list ap);
-static inline
-char *MakeSDPMedia (const char *type, int dport, const char *protocol,
-                    unsigned pt, const char *rtpmap, const char *fmtpfmt, ...)
-{
-    va_list ap;
-    char *ret;
-    va_start (ap, fmtpfmt);
-    ret = vMakeSDPMedia (type, dport, protocol, pt, rtpmap, fmtpfmt, ap);
-    va_end (ap);
-    return ret;
-}
+
+char *vAddSDPMedia (const char *type, int dport, const char *protocol,
+                    unsigned pt, const char *rtpmap,
+                    const char *fmtpfmt, va_list ap);
+char *AddSDPMedia (const char *type, int dport,
+                   const char *protocol, unsigned pt, const char *rtpmap,
+                   const char *fmtpfmt, ...);
+
+#endif