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 /libmpcodecs/dec_video.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 'libmpcodecs/dec_video.c')
| -rw-r--r-- | libmpcodecs/dec_video.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index 9d8ce75af4..7a3e826e45 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -28,7 +28,7 @@ #include "dec_video.h" -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS #include <dlfcn.h> #endif @@ -162,7 +162,7 @@ void uninit_video(sh_video_t *sh_video) return; mp_msg(MSGT_DECVIDEO, MSGL_V, MSGTR_UninitVideoStr, sh_video->codec->drv); sh_video->vd_driver->uninit(sh_video); -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS if (sh_video->dec_handle) dlclose(sh_video->dec_handle); #endif @@ -225,7 +225,7 @@ static int init_video(sh_video_t *sh_video, char *codecname, char *vfm, sh_video->codec->drv)) break; sh_video->vd_driver = mpcodecs_vd_drivers[i]; -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS if (!sh_video->vd_driver) { /* try to open shared decoder plugin */ int buf_len; |