Commit 88148cbd authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Fixes

parent 620dc72a
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * 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 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 * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * 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, ...@@ -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, unsigned pt, const char *rtpmap,
const char *fmtpfmt, va_list ap) const char *fmtpfmt, va_list ap)
{ {
...@@ -195,3 +195,15 @@ char *vMakeSDPMedia (const char *type, int dport, const char *protocol, ...@@ -195,3 +195,15 @@ char *vMakeSDPMedia (const char *type, int dport, const char *protocol,
return sdp_media; 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;
}
...@@ -24,8 +24,11 @@ ...@@ -24,8 +24,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
***************************************************************************/ ***************************************************************************/
#include <vlc_sout.h> #ifndef VLC_SRC_STREAMOUT_H
#include <vlc_network.h> # define VLC_SRC_STREAMOUT_H 1
# include <vlc_sout.h>
# include <vlc_network.h>
/**************************************************************************** /****************************************************************************
* sout_packetizer_input_t: p_sout <-> p_packetizer * sout_packetizer_input_t: p_sout <-> p_packetizer
...@@ -118,17 +121,12 @@ char *StartSDP (const char *name, const char *description, const char *url, ...@@ -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 char *email, const char *phone, vlc_bool_t ssm,
const struct sockaddr *orig, socklen_t origlen, const struct sockaddr *orig, socklen_t origlen,
const struct sockaddr *addr, socklen_t addrlen); const struct sockaddr *addr, socklen_t addrlen);
char *vMakeSDPMedia (const char *type, int dport, const char *protocol,
unsigned pt, const char *rtpmap, char *vAddSDPMedia (const char *type, int dport, const char *protocol,
const char *fmtp, va_list ap); unsigned pt, const char *rtpmap,
static inline const char *fmtpfmt, va_list ap);
char *MakeSDPMedia (const char *type, int dport, const char *protocol, char *AddSDPMedia (const char *type, int dport,
unsigned pt, const char *rtpmap, const char *fmtpfmt, ...) const char *protocol, unsigned pt, const char *rtpmap,
{ const char *fmtpfmt, ...);
va_list ap;
char *ret; #endif
va_start (ap, fmtpfmt);
ret = vMakeSDPMedia (type, dport, protocol, pt, rtpmap, fmtpfmt, ap);
va_end (ap);
return ret;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment