ffplay diff commenting out rtsp for no network by (Bill Eldridge <bill at rfa dot org>)
Originally committed as revision 2176 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
264cb2b82f
commit
400738b1fb
7
ffplay.c
7
ffplay.c
@ -1303,6 +1303,7 @@ static int decode_thread(void *arg)
|
|||||||
for(;;) {
|
for(;;) {
|
||||||
if (is->abort_request)
|
if (is->abort_request)
|
||||||
break;
|
break;
|
||||||
|
#ifdef CONFIG_NETWORK
|
||||||
if (is->paused != is->last_paused) {
|
if (is->paused != is->last_paused) {
|
||||||
is->last_paused = is->paused;
|
is->last_paused = is->paused;
|
||||||
if (ic->iformat == &rtsp_demux) {
|
if (ic->iformat == &rtsp_demux) {
|
||||||
@ -1318,6 +1319,7 @@ static int decode_thread(void *arg)
|
|||||||
SDL_Delay(10);
|
SDL_Delay(10);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* if the queue are full, no need to read more */
|
/* if the queue are full, no need to read more */
|
||||||
if (is->audioq.size > MAX_AUDIOQ_SIZE ||
|
if (is->audioq.size > MAX_AUDIOQ_SIZE ||
|
||||||
@ -1595,12 +1597,13 @@ static void opt_format(const char *arg)
|
|||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#ifdef CONFIG_NETWORK
|
||||||
void opt_rtp_tcp(void)
|
void opt_rtp_tcp(void)
|
||||||
{
|
{
|
||||||
/* only tcp protocol */
|
/* only tcp protocol */
|
||||||
rtsp_default_protocols = (1 << RTSP_PROTOCOL_RTP_TCP);
|
rtsp_default_protocols = (1 << RTSP_PROTOCOL_RTP_TCP);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void opt_sync(const char *arg)
|
void opt_sync(const char *arg)
|
||||||
{
|
{
|
||||||
@ -1627,7 +1630,9 @@ const OptionDef options[] = {
|
|||||||
{ "nodisp", OPT_BOOL, {(void*)&display_disable}, "disable graphical display" },
|
{ "nodisp", OPT_BOOL, {(void*)&display_disable}, "disable graphical display" },
|
||||||
{ "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" },
|
{ "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" },
|
||||||
{ "stats", OPT_BOOL | OPT_EXPERT, {(void*)&show_status}, "show status", "" },
|
{ "stats", OPT_BOOL | OPT_EXPERT, {(void*)&show_status}, "show status", "" },
|
||||||
|
#ifdef CONFIG_NETWORK
|
||||||
{ "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
|
||||||
{ "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" },
|
||||||
{ NULL, },
|
{ NULL, },
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user