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 /libvo/vo_gif89a.c | |
| parent | 2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff) | |
| parent | af76be6e197382af491fadef3fcf821a721c99f5 (diff) | |
| download | mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.bz2 mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.xz | |
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 'libvo/vo_gif89a.c')
| -rw-r--r-- | libvo/vo_gif89a.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c index 58da54e8cb..869276d9c4 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. |