diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2004-02-29 17:26:45 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2004-02-29 17:26:45 +0000 |
| commit | 21272e4f1caa9d0b3fe81f68929e8bbba125a977 (patch) | |
| tree | 34e6b88093d79653a2bdd60a9a127a18cfda2f1d /src/input/mms.c | |
| parent | a657c3df2f453941b115de0ece3ad8d849d58a6b (diff) | |
| download | xine-lib-21272e4f1caa9d0b3fe81f68929e8bbba125a977.tar.gz xine-lib-21272e4f1caa9d0b3fe81f68929e8bbba125a977.tar.bz2 | |
Various compilation fixes and updates:
- xine compilable without iconv (scream if I something broke)
- update MSVC port, fixes in avi demux
- add iff.h into makefiles
- ffmpeg depends on zlib (build was OK only when freetype was installed)
- commit a patch for goom
CVS patchset: 6192
CVS date: 2004/02/29 17:26:45
Diffstat (limited to 'src/input/mms.c')
| -rw-r--r-- | src/input/mms.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/input/mms.c b/src/input/mms.c index 7c5afc13f..3fd7066f2 100644 --- a/src/input/mms.c +++ b/src/input/mms.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002-2003 the xine project + * Copyright (C) 2002-2004 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: mms.c,v 1.40 2003/12/11 01:15:53 tmattern Exp $ + * $Id: mms.c,v 1.41 2004/02/29 17:26:49 valtri Exp $ * * MMS over TCP protocol * based on work from major mms @@ -46,7 +46,7 @@ #include <stdlib.h> #include <time.h> -#if !defined(_MSC_VER) && defined(HAVE_LANGINFO_CODESET) +#if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_CODESET) #define USE_ICONV #include <iconv.h> #include <locale.h> |