diff options
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/asfheader.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_ogg.c | 2 | ||||
-rw-r--r-- | libmpdemux/demuxer.c | 4 | ||||
-rw-r--r-- | libmpdemux/stheader.h | 4 | ||||
-rw-r--r-- | libmpdemux/video.c | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index 0228dc87f9..93bd1354a9 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -639,7 +639,7 @@ if(streams) { // as the servers often do not care about what we requested. #if 0 uint32_t vr = 0, ar = 0,i; -#ifdef MPLAYER_NETWORK +#ifdef CONFIG_NETWORK if( demuxer->stream->streaming_ctrl!=NULL ) { if( demuxer->stream->streaming_ctrl->bandwidth!=0 && demuxer->stream->streaming_ctrl->data!=NULL ) { best_audio = ((asf_http_streaming_ctrl_t*)demuxer->stream->streaming_ctrl->data)->audio_id; diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index e3480a4e59..14bd180532 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -19,7 +19,7 @@ #define FOURCC_SPEEX mmioFOURCC('s', 'p', 'x', ' ') #define FOURCC_THEORA mmioFOURCC('t', 'h', 'e', 'o') -#ifdef TREMOR +#ifdef CONFIG_TREMOR #include <tremor/ogg.h> #include <tremor/ivorbiscodec.h> #else diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index a330a427aa..20130332fd 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -130,10 +130,10 @@ const demuxer_desc_t *const demuxer_list[] = { &demuxer_desc_h264_es, &demuxer_desc_audio, &demuxer_desc_mpeg_ty, -#ifdef STREAMING_LIVE555 +#ifdef CONFIG_LIVE555 &demuxer_desc_rtp, #endif -#ifdef LIBNEMESI +#ifdef CONFIG_LIBNEMESI &demuxer_desc_rtp_nemesi, #endif #ifdef CONFIG_LIBAVFORMAT diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index defdf7e986..4f2266be8b 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -38,7 +38,7 @@ typedef struct { // void* audio_out; // the audio_out handle, used for this audio stream struct af_stream_s *afilter; // the audio filter stream struct ad_functions_s* ad_driver; -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS void *dec_handle; #endif // win32-compatible codec parameters: @@ -83,7 +83,7 @@ typedef struct { unsigned int outfmtidx; struct vf_instance_s *vfilter; // the video filter chain, used for this video stream int vf_initialized; -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS void *dec_handle; #endif // win32-compatible codec parameters: diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 95348a8efa..0e7dfe618c 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -25,7 +25,7 @@ /* biCompression constant */ #define BI_RGB 0L -#ifdef STREAMING_LIVE555 +#ifdef CONFIG_LIVE555 #include "demux_rtp.h" #endif @@ -57,7 +57,7 @@ static video_codec_t find_video_codec(sh_video_t *sh_video) ((! sh_video->format) || (sh_video->format==0x10000001) || (sh_video->format==0x10000002)) ) || (fmt == DEMUXER_TYPE_MPEG_TY) -#ifdef STREAMING_LIVE555 +#ifdef CONFIG_LIVE555 || ((fmt == DEMUXER_TYPE_RTP) && demux_is_mpeg_rtp_stream(d_video->demuxer)) #endif ) |