Commit c482500f authored by Ronald S. Bultje's avatar Ronald S. Bultje Committed by Diego Biurrun

Drop RTSP default protocol.

patch by Ronald S. Bultje, rsbultje gmail com

Originally committed as revision 11377 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ae904fd0
......@@ -2391,14 +2391,6 @@ static void opt_frame_pix_fmt(const char *arg)
frame_pix_fmt = avcodec_get_pix_fmt(arg);
}
#ifdef CONFIG_RTSP_DEMUXER
static void opt_rtp_tcp(void)
{
/* only tcp protocol */
rtsp_default_protocols = (1 << RTSP_PROTOCOL_RTP_TCP);
}
#endif
static void opt_sync(const char *arg)
{
if (!strcmp(arg, "audio"))
......@@ -2476,9 +2468,6 @@ const OptionDef options[] = {
{ "idct", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&idct}, "set idct algo", "algo" },
{ "er", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_resilience}, "set error detection threshold (0-4)", "threshold" },
{ "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options", "bit_mask" },
#ifdef CONFIG_RTSP_DEMUXER
{ "rtp_tcp", OPT_EXPERT, {(void*)&opt_rtp_tcp}, "force RTP/TCP protocol usage", "" },
#endif
{ "sync", HAS_ARG | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" },
{ "threads", HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" },
{ NULL, },
......
......@@ -77,7 +77,9 @@ static int rtsp_read_play(AVFormatContext *s);
/* XXX: currently, the only way to change the protocols consists in
changing this variable */
#if LIBAVFORMAT_VERSION_INT < (53 << 16)
int rtsp_default_protocols = (1 << RTSP_PROTOCOL_RTP_UDP);
#endif
static int rtsp_probe(AVProbeData *p)
{
......
......@@ -81,7 +81,9 @@ typedef int FFRTSPCallback(enum RTSPCallbackAction action,
int rtsp_init(void);
void rtsp_parse_line(RTSPHeader *reply, const char *buf);
#if LIBAVFORMAT_VERSION_INT < (53 << 16)
extern int rtsp_default_protocols;
#endif
extern int rtsp_rtp_port_min;
extern int rtsp_rtp_port_max;
......
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