modules/misc/sap.c: fix for the default scope of the IPv6 announces.

python/setup.py: a configuration that should work better.

diff --git a/modules/misc/sap.c b/modules/misc/sap.c
index f0f8c38eb15e5c8118eb96712cca9f5deebc19ae..0483a06cbd171bc13f5e20edf747efa709172954 100644 (file)
--- a/modules/misc/sap.c
+++ b/modules/misc/sap.c
@@ -2,7 +2,7 @@
  * sap.c :  SAP interface module
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: sap.c,v 1.14 2003/06/18 12:18:51 zorglub Exp $
+ * $Id: sap.c,v 1.15 2003/06/20 11:42:07 alexis Exp $
  *
  * Authors: Arnaud Schauly <gitan@via.ecp.fr>
  *
@@ -26,7 +26,7 @@
  *****************************************************************************/
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
- 
+
 #include <errno.h>                                                 /* ENOMEM */
 #include <stdio.h>
 #include <ctype.h>
@@ -61,7 +61,7 @@
 #      include <net/netdb.h>
 #   endif
 #endif
- 
+
 #ifdef UNDER_CE
 #   define close(a) CloseHandle(a);
 #elif defined( WIN32 )
@@ -151,9 +151,9 @@ vlc_module_begin();
                    "Set this if you want SAP to listen for IPv6 announces",
                    VLC_TRUE);
 
-        add_string( "sap-ipv6-scope", "3" , NULL,
+        add_string( "sap-ipv6-scope", "8" , NULL,
                     "IPv6-SAP scope",
-                    "Sets the scope for IPv6 announces (default is 3)",
+                    "Sets the scope for IPv6 announces (default is 8)",
                     VLC_TRUE);
 
     set_description( _("SAP interface") );

diff --git a/python/setup.py b/python/setup.py
index e7198c07a8dde7867eefd8858e7a663f41eb583d..6e77ec55bb25d25e45aefb5fd63a64f9c538ced4 100644 (file)
--- a/python/setup.py
+++ b/python/setup.py
@@ -1,6 +1,6 @@
 from distutils.core import setup, Extension
 
-FFMPEG_DIR = '/home/cyril/ffmpeg'
+FFMPEG_DIR = '../ffmpeg'
 
 vlc = Extension('vlc',
                 sources = ['vlcmodule.c'],
@@ -9,7 +9,7 @@ vlc = Extension('vlc',
                              'memcpymmx','stream_out_transcode',
                              'i420_rgb_mmx','i420_yuy2_mmx','i420_ymga_mmx',
                              'i422_yuy2_mmx','memcpymmxext','memcpy3dn',
-                             'encoder_ffmpeg','avcodec'],
+                             'avcodec'],
                 library_dirs = [ '../lib',
                                 '../modules/stream_out', '../modules/encoder/ffmpeg',
                                 '../modules/misc/memcpy','../modules/video_chroma',