diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2007-04-26 18:09:16 +0000 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2007-04-26 18:09:16 +0000 |
| commit | cfc970772d7c4d65fc9811557344de874df2d2e4 (patch) | |
| tree | e2bfe49225075ee30631207d28dbd3934410913d /ffplay.c | |
| parent | 383eda234879aad7e90fe73c52574ef7e735f85c (diff) | |
| download | android_external_ffmpeg-cfc970772d7c4d65fc9811557344de874df2d2e4.tar.gz android_external_ffmpeg-cfc970772d7c4d65fc9811557344de874df2d2e4.tar.bz2 android_external_ffmpeg-cfc970772d7c4d65fc9811557344de874df2d2e4.zip | |
Use correct RTSP_DEMUXER checks instead of NETWORK.
Originally committed as revision 8835 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffplay.c')
| -rw-r--r-- | ffplay.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1908,7 +1908,7 @@ static int decode_thread(void *arg) goto fail; } is->ic = ic; -#ifdef CONFIG_NETWORK +#ifdef CONFIG_RTSP_DEMUXER use_play = (ic->iformat == &rtsp_demuxer); #else use_play = 0; @@ -2410,7 +2410,7 @@ static void opt_frame_pix_fmt(const char *arg) frame_pix_fmt = avcodec_get_pix_fmt(arg); } -#ifdef CONFIG_NETWORK +#ifdef CONFIG_RTSP_DEMUXER static void opt_rtp_tcp(void) { /* only tcp protocol */ @@ -2482,7 +2482,7 @@ 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_NETWORK +#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" }, |