mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-07-01 05:31:04 +08:00
Use correct RTSP_DEMUXER checks instead of NETWORK.
Originally committed as revision 8835 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
6
ffplay.c
6
ffplay.c
@ -1908,7 +1908,7 @@ static int decode_thread(void *arg)
|
|||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
is->ic = ic;
|
is->ic = ic;
|
||||||
#ifdef CONFIG_NETWORK
|
#ifdef CONFIG_RTSP_DEMUXER
|
||||||
use_play = (ic->iformat == &rtsp_demuxer);
|
use_play = (ic->iformat == &rtsp_demuxer);
|
||||||
#else
|
#else
|
||||||
use_play = 0;
|
use_play = 0;
|
||||||
@ -2410,7 +2410,7 @@ static void opt_frame_pix_fmt(const char *arg)
|
|||||||
frame_pix_fmt = avcodec_get_pix_fmt(arg);
|
frame_pix_fmt = avcodec_get_pix_fmt(arg);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_NETWORK
|
#ifdef CONFIG_RTSP_DEMUXER
|
||||||
static void opt_rtp_tcp(void)
|
static void opt_rtp_tcp(void)
|
||||||
{
|
{
|
||||||
/* only tcp protocol */
|
/* only tcp protocol */
|
||||||
@ -2482,7 +2482,7 @@ const OptionDef options[] = {
|
|||||||
{ "idct", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&idct}, "set idct algo", "algo" },
|
{ "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" },
|
{ "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" },
|
{ "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options", "bit_mask" },
|
||||||
#ifdef CONFIG_NETWORK
|
#ifdef CONFIG_RTSP_DEMUXER
|
||||||
{ "rtp_tcp", OPT_EXPERT, {(void*)&opt_rtp_tcp}, "force RTP/TCP protocol usage", "" },
|
{ "rtp_tcp", OPT_EXPERT, {(void*)&opt_rtp_tcp}, "force RTP/TCP protocol usage", "" },
|
||||||
#endif
|
#endif
|
||||||
{ "sync", HAS_ARG | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" },
|
{ "sync", HAS_ARG | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" },
|
||||||
|
Reference in New Issue
Block a user