Revision c482500f

View differences:

ffplay.c
2391 2391
    frame_pix_fmt = avcodec_get_pix_fmt(arg);
2392 2392
}
2393 2393

  
2394
#ifdef CONFIG_RTSP_DEMUXER
2395
static void opt_rtp_tcp(void)
2396
{
2397
    /* only tcp protocol */
2398
    rtsp_default_protocols = (1 << RTSP_PROTOCOL_RTP_TCP);
2399
}
2400
#endif
2401

  
2402 2394
static void opt_sync(const char *arg)
2403 2395
{
2404 2396
    if (!strcmp(arg, "audio"))
......
2476 2468
    { "idct", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&idct}, "set idct algo",  "algo" },
2477 2469
    { "er", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_resilience}, "set error detection threshold (0-4)",  "threshold" },
2478 2470
    { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options",  "bit_mask" },
2479
#ifdef CONFIG_RTSP_DEMUXER
2480
    { "rtp_tcp", OPT_EXPERT, {(void*)&opt_rtp_tcp}, "force RTP/TCP protocol usage", "" },
2481
#endif
2482 2471
    { "sync", HAS_ARG | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" },
2483 2472
    { "threads", HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" },
2484 2473
    { NULL, },
libavformat/rtsp.c
77 77
/* XXX: currently, the only way to change the protocols consists in
78 78
   changing this variable */
79 79

  
80
#if LIBAVFORMAT_VERSION_INT < (53 << 16)
80 81
int rtsp_default_protocols = (1 << RTSP_PROTOCOL_RTP_UDP);
82
#endif
81 83

  
82 84
static int rtsp_probe(AVProbeData *p)
83 85
{
libavformat/rtsp.h
81 81
int rtsp_init(void);
82 82
void rtsp_parse_line(RTSPHeader *reply, const char *buf);
83 83

  
84
#if LIBAVFORMAT_VERSION_INT < (53 << 16)
84 85
extern int rtsp_default_protocols;
86
#endif
85 87
extern int rtsp_rtp_port_min;
86 88
extern int rtsp_rtp_port_max;
87 89

  

Also available in: Unified diff