diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:04:43 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:13:09 +0300 |
commit | 17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch) | |
tree | 5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 /libmpdemux | |
parent | 2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff) | |
parent | af76be6e197382af491fadef3fcf821a721c99f5 (diff) |
Merge svn changes up to r27441
Conflicts:
cfg-common-opts.h
command.c
configure
input/input.c
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpdemux/stheader.h
libvo/sub.c
libvo/video_out.c
libvo/vo_xv.c
libvo/vosub_vidix.c
libvo/x11_common.c
libvo/x11_common.h
mp_core.h
mplayer.c
stream/stream.h
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/asfheader.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_gif.c | 4 | ||||
-rw-r--r-- | libmpdemux/demux_mov.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_ogg.c | 8 | ||||
-rw-r--r-- | libmpdemux/demuxer.c | 10 | ||||
-rw-r--r-- | libmpdemux/demuxer.h | 2 | ||||
-rw-r--r-- | libmpdemux/stheader.h | 4 | ||||
-rw-r--r-- | libmpdemux/video.c | 4 |
8 files changed, 18 insertions, 18 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_gif.c b/libmpdemux/demux_gif.c index 99135db0c8..99aa134d92 100644 --- a/libmpdemux/demux_gif.c +++ b/libmpdemux/demux_gif.c @@ -29,7 +29,7 @@ typedef struct { #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F') -#ifndef HAVE_GIF_TVT_HACK +#ifndef CONFIG_GIF_TVT_HACK // not supported by certain versions of the library int my_read_gif(GifFileType *gif, uint8_t *buf, int len) { return stream_read(gif->UserData, buf, len); @@ -230,7 +230,7 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer) // go back to the beginning stream_seek(demuxer->stream,demuxer->stream->start_pos); -#ifdef HAVE_GIF_TVT_HACK +#ifdef CONFIG_GIF_TVT_HACK // without the TVT functionality of libungif, a hard seek must be // done to the beginning of the file. this is because libgif is // unable to use mplayer's cache, and without this lseek libgif will diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index f31285bef2..d23459d3c7 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -25,7 +25,7 @@ #include "config.h" -#ifdef HAVE_QUICKTIME +#ifdef CONFIG_QUICKTIME #include <QuickTime/QuickTime.h> #include <QuickTime/ImageCompression.h> #include <QuickTime/ImageCodec.h> diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index fe5697fc3d..d4e10d29b9 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -20,7 +20,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 @@ -196,7 +196,7 @@ void demux_ogg_add_sub (ogg_stream_t* os,ogg_packet* pack) { mp_msg(MSGT_DEMUX,MSGL_DBG2,"Ogg sub lines: %d first: '%s'\n", ogg_sub.lines, ogg_sub.text[0]); -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV subcp_recode(&ogg_sub); #endif vo_sub = &ogg_sub; @@ -745,7 +745,7 @@ int demux_ogg_open(demuxer_t* demuxer) { sh_audio_t* sh_a; sh_video_t* sh_v; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV subcp_open(NULL); #endif @@ -1487,7 +1487,7 @@ static void demux_close_ogg(demuxer_t* demuxer) { if(!ogg_d) return; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV subcp_close(); #endif diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 6d27566d71..7c55ddcab7 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -111,7 +111,7 @@ const demuxer_desc_t *const demuxer_list[] = { &demuxer_desc_fli, &demuxer_desc_film, &demuxer_desc_roq, -#ifdef HAVE_GIF +#ifdef CONFIG_GIF &demuxer_desc_gif, #endif #ifdef CONFIG_OGGVORBIS @@ -131,16 +131,16 @@ 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 &demuxer_desc_lavf, #endif -#ifdef MUSEPACK +#ifdef CONFIG_MUSEPACK &demuxer_desc_mpc, #endif #ifdef CONFIG_LIBDV095 @@ -150,7 +150,7 @@ const demuxer_desc_t *const demuxer_list[] = { #ifdef CONFIG_LIBNUT &demuxer_desc_nut, #endif -#ifdef HAVE_XMMS +#ifdef CONFIG_XMMS &demuxer_desc_xmms, #endif /* Please do not add any new demuxers here. If you want to implement a new diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 5e5a54558f..db44a33ca4 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -11,7 +11,7 @@ struct MPOpts; #define MAX_PACKS 4096 -#ifdef HAVE_TV_BSDBT848 +#ifdef CONFIG_TV_BSDBT848 #define MAX_PACK_BYTES 0x2000000 #else #define MAX_PACK_BYTES 0x800000 diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index 6ca9866ec3..203556bdda 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -39,7 +39,7 @@ typedef struct sh_audio { // void* audio_out; // the audio_out handle, used for this audio stream struct af_stream *afilter; // the audio filter stream struct ad_functions *ad_driver; -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS void *dec_handle; #endif // win32-compatible codec parameters: @@ -87,7 +87,7 @@ typedef struct sh_video { int output_flags; // query_format() results for output filters+vo const struct vd_functions *vd_driver; 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 ) |