diff options
| -rw-r--r-- | cfg-mplayer.h | 4 | ||||
| -rwxr-xr-x | configure | 26 | ||||
| -rw-r--r-- | libmpcodecs/vd.c | 4 | ||||
| -rw-r--r-- | libmpdemux/demux_gif.c | 4 | ||||
| -rw-r--r-- | libmpdemux/demuxer.c | 2 | ||||
| -rw-r--r-- | libvo/video_out.c | 8 | ||||
| -rw-r--r-- | libvo/vo_gif89a.c | 6 |
7 files changed, 27 insertions, 27 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 996432f9ef..b74c53a6bb 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -128,11 +128,11 @@ const m_option_t mplayer_opts[]={ #endif // -vo png only: -#ifdef HAVE_PNG +#ifdef CONFIG_PNG {"z", "-z has been removed. Use -vo png:z=<0-9> instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #endif // -vo jpeg only: -#ifdef HAVE_JPEG +#ifdef CONFIG_JPEG {"jpeg", "-jpeg has been removed. Use -vo jpeg:<options> instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #endif @@ -4635,12 +4635,12 @@ EOF fi echores "$_png" if test "$_png" = yes ; then - _def_png='#define HAVE_PNG 1' + _def_png='#define CONFIG_PNG 1' _ld_extra="$_ld_extra -lpng -lz" _vosrc="$_vosrc vo_png.c" _vomodules="png $_vomodules" else - _def_png='#undef HAVE_PNG' + _def_png='#undef CONFIG_PNG' _novomodules="png $_novomodules" fi @@ -4664,12 +4664,12 @@ fi echores "$_jpeg" if test "$_jpeg" = yes ; then - _def_jpeg='#define HAVE_JPEG 1' + _def_jpeg='#define CONFIG_JPEG 1' _vosrc="$_vosrc vo_jpeg.c" _vomodules="jpeg $_vomodules" _ld_extra="$_ld_extra -ljpeg" else - _def_jpeg='#undef HAVE_JPEG' + _def_jpeg='#undef CONFIG_JPEG' _novomodules="jpeg $_novomodules" fi @@ -4677,11 +4677,11 @@ fi echocheck "PNM support" if test "$_pnm" = yes; then - _def_pnm="#define HAVE_PNM" + _def_pnm="#define CONFIG_PNM" _vosrc="$_vosrc vo_pnm.c" _vomodules="pnm $_vomodules" else - _def_pnm="#undef HAVE_PNM" + _def_pnm="#undef CONFIG_PNM" _novomodules="pnm $_novomodules" fi echores "$_pnm" @@ -4723,12 +4723,12 @@ if test "$_force_gif" = yes && test "$_gif" = no ; then fi if test "$_gif" = yes ; then - _def_gif='#define HAVE_GIF 1' + _def_gif='#define CONFIG_GIF 1' _vosrc="$_vosrc vo_gif89a.c" _codecmodules="gif $_codecmodules" _vomodules="gif89a $_vomodules" _res_comment="old version, some encoding functions disabled" - _def_gif_4='#undef HAVE_GIF_4' + _def_gif_4='#undef CONFIG_GIF_4' _ld_extra="$_ld_extra $_ld_gif" cat > $TMPC << EOF @@ -4743,12 +4743,12 @@ int main(void) { } EOF if cc_check "$_ld_gif" && tmp_run ; then - _def_gif_4='#define HAVE_GIF_4 1' + _def_gif_4='#define CONFIG_GIF_4 1' _res_comment="" fi else - _def_gif='#undef HAVE_GIF' - _def_gif_4='#undef HAVE_GIF_4' + _def_gif='#undef CONFIG_GIF' + _def_gif_4='#undef CONFIG_GIF_4' _novomodules="gif89a $_novomodules" _nocodecmodules="gif $_nocodecmodules" fi @@ -4757,7 +4757,7 @@ echores "$_gif" case "$_gif" in yes*) echocheck "broken giflib workaround" - _def_gif_tvt_hack='#define HAVE_GIF_TVT_HACK 1' + _def_gif_tvt_hack='#define CONFIG_GIF_TVT_HACK 1' cat > $TMPC << EOF #include <gif_lib.h> @@ -4768,7 +4768,7 @@ int main(void) { } EOF if cc_check "$_ld_gif" && tmp_run ; then - _def_gif_tvt_hack='#undef HAVE_GIF_TVT_HACK' + _def_gif_tvt_hack='#undef CONFIG_GIF_TVT_HACK' echores "disabled" else echores "enabled" diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 9307bb4e81..281e67ba0c 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -74,10 +74,10 @@ vd_functions_t* mpcodecs_vd_drivers[] = { #ifdef CONFIG_XANIM &mpcodecs_vd_xanim, #endif -#ifdef HAVE_PNG +#ifdef CONFIG_PNG &mpcodecs_vd_mpng, #endif -#ifdef HAVE_JPEG +#ifdef CONFIG_JPEG &mpcodecs_vd_ijpg, #endif &mpcodecs_vd_mtga, 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/demuxer.c b/libmpdemux/demuxer.c index 2b96119ca0..b9220ccc3e 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -110,7 +110,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 diff --git a/libvo/video_out.c b/libvo/video_out.c index c59b408d47..083ad55dfa 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -228,19 +228,19 @@ const vo_functions_t* const video_out_drivers[] = #ifdef CONFIG_YUV4MPEG &video_out_yuv4mpeg, #endif -#ifdef HAVE_PNG +#ifdef CONFIG_PNG &video_out_png, #endif -#ifdef HAVE_JPEG +#ifdef CONFIG_JPEG &video_out_jpeg, #endif -#ifdef HAVE_GIF +#ifdef CONFIG_GIF &video_out_gif89a, #endif #ifdef CONFIG_TGA &video_out_tga, #endif -#ifdef HAVE_PNM +#ifdef CONFIG_PNM &video_out_pnm, #endif #ifdef CONFIG_MD5SUM diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c index 6422ec7ecb..e3e1d6ac95 100644 --- a/libvo/vo_gif89a.c +++ b/libvo/vo_gif89a.c @@ -157,7 +157,7 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) { -#ifdef HAVE_GIF_4 +#ifdef CONFIG_GIF_4 // these are control blocks for the gif looping extension. char LB1[] = "NETSCAPE2.0"; char LB2[] = { 1, 0, 0 }; @@ -190,7 +190,7 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width, // earlier versions of libungif. i don't know exactly which, // but certainly in all those before v4. if you have problems, // you need to upgrade your gif library. -#ifdef HAVE_GIF_4 +#ifdef CONFIG_GIF_4 EGifSetGifVersion("89a"); #else mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: Your version of libungif needs to be upgraded.\n"); @@ -232,7 +232,7 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width, // set the initial width and height info. EGifPutScreenDesc(new_gif, s_width, s_height, 256, 0, reduce_cmap); -#ifdef HAVE_GIF_4 +#ifdef CONFIG_GIF_4 // version 3 of libungif does not support multiple control blocks. // looping requires multiple control blocks. // therefore, looping is only enabled for v4 and up. |