Mercurial > mplayer.hg
changeset 2897:283eab7c4c8e
Added proper #include's for libvo2
| author | mswitch |
|---|---|
| date | Wed, 14 Nov 2001 11:16:45 +0000 |
| parents | 3a44575edc30 |
| children | 4c2db939183e |
| files | codec-cfg.c configure dll_init.c find_sub.c mencoder.c mplayer.c xacodec.c |
| diffstat | 7 files changed, 29 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/codec-cfg.c Wed Nov 14 10:49:12 2001 +0000 +++ b/codec-cfg.c Wed Nov 14 11:16:45 2001 +0000 @@ -18,7 +18,11 @@ // for mmioFOURCC: #include "wine/avifmt.h" +#ifdef USE_LIBVO2 +#include "libvo2/img_format.h" +#else #include "libvo/img_format.h" +#endif #include "codec-cfg.h" #define PRINT_LINENUM printf(" at line %d\n", line_num)
--- a/configure Wed Nov 14 10:49:12 2001 +0000 +++ b/configure Wed Nov 14 11:16:45 2001 +0000 @@ -2522,12 +2522,12 @@ fi if test "$_vo2" = yes ; then - _vodef='#define USE_LIBVO2' + _vodef='-DUSE_LIBVO2' _volib='-Llibvo2 -lvo2' _voinc='-Ilibvo2' _vodir='libvo2' else - _vodef='#undef USE_LIBVO2' + _vodef='' _volib='-Llibvo -lvo' _voinc='-Ilibvo' _vodir='libvo' @@ -2582,7 +2582,7 @@ AR=ar CC=$_cc # OPTFLAGS=-O4 $_profile $_debug $_march $_mcpu -pipe -fomit-frame-pointer -ffast-math -OPTFLAGS=$CFLAGS +OPTFLAGS=$CFLAGS $_vodef EXTRA_INC=$_extraincdir $_voinc $_gtkinc WIN32_PATH=-DWIN32_PATH=\\"$_win32libdir\\" VO_INC=$_voinc @@ -2650,7 +2650,6 @@ #define USE_OSD #define USE_SUB -$_vodef $_debugdef
--- a/dll_init.c Wed Nov 14 10:49:12 2001 +0000 +++ b/dll_init.c Wed Nov 14 11:16:45 2001 +0000 @@ -24,7 +24,11 @@ #include "dll_init.h" +#ifdef USE_LIBVO2 +#include "libvo2/img_format.h" +#else #include "libvo/img_format.h" +#endif #include "linux/shmem.h" extern int divx_quality;
--- a/find_sub.c Wed Nov 14 10:49:12 2001 +0000 +++ b/find_sub.c Wed Nov 14 11:16:45 2001 +0000 @@ -8,9 +8,14 @@ #include <stdio.h> +#ifdef USE_LIBVO2 +#include "libvo2/libvo2.h" +#include "libvo2/sub.h" +#else #include "libvo/video_out.h" +#include "libvo/sub.h" +#endif #include "subreader.h" -#include "libvo/sub.h" static int current_sub=0;
--- a/mencoder.c Wed Nov 14 10:49:12 2001 +0000 +++ b/mencoder.c Wed Nov 14 11:16:45 2001 +0000 @@ -20,7 +20,11 @@ #include "aviwrite.h" +#ifdef USE_LIBVO2 +#include "libvo2/libvo2.h" +#else #include "libvo/video_out.h" +#endif #include "dec_audio.h" #include "dec_video.h"
--- a/mplayer.c Wed Nov 14 10:49:12 2001 +0000 +++ b/mplayer.c Wed Nov 14 11:16:45 2001 +0000 @@ -39,9 +39,11 @@ extern void* mDisplay; // Display* mDisplay; #endif -//#ifdef USE_OSD +#ifdef USE_LIBVO2 +#include "libvo2/sub.h" +#else #include "libvo/sub.h" -//#endif +#endif #include "libao2/audio_out.h"