[SCM] VLC media player packaging branch, sid, updated. debian/1.0.1-1-8-g7755270

xtophe-guest at users.alioth.debian.org xtophe-guest at users.alioth.debian.org
Thu Aug 27 22:22:49 UTC 2009


The following commit has been merged in the sid branch:
commit e360c3951539c399623cbce0c89cfd24f37a0e01
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Sat Aug 22 17:21:46 2009 +0200

    Revert "WIP changelog"
    
    This reverts commit 9e3eeb1786709f36581cebea3ca17971f3aa73cb.

diff --git a/autotools/ltmain.sh b/autotools/ltmain.sh
index f308ee0..3506ead 100755
--- a/autotools/ltmain.sh
+++ b/autotools/ltmain.sh
@@ -4716,11 +4716,6 @@ func_mode_link ()
 	arg=$func_stripname_result
 	;;
 
-      -Wl,--as-needed)
-	deplibs="$deplibs $arg"
-	continue
-	;;
-      
       -Wl,*)
 	func_stripname '-Wl,' '' "$arg"
 	args=$func_stripname_result
@@ -5075,15 +5070,6 @@ func_mode_link ()
 	lib=
 	found=no
 	case $deplib in
-	-Wl,--as-needed)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	  fi
-	  continue
-	  ;;
 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
diff --git a/debian/changelog b/debian/changelog
index 0438095..13aab6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,3 @@
-vlc (1.0.1-2~1.gbp80905b) unstable; urgency=low
-
-  ** SNAPSHOT build @80905b1685b004f6e428c91498d4674e098b6245 **
-
-  * Allow building against libass 0.9.7
-  * Don't try to install v4l2 modules on kfreebsd
-
- -- Christophe Mutricy <xtophe at videolan.org>  Sat, 22 Aug 2009 13:49:19 +0200
-
 vlc (1.0.1-1) unstable; urgency=low
 
   * New upstream bugfix version
diff --git a/debian/vlc-nox.install.kfreebsd-amd64 b/debian/vlc-nox.install.kfreebsd-amd64
index 399f59b..791d48c 100644
--- a/debian/vlc-nox.install.kfreebsd-amd64
+++ b/debian/vlc-nox.install.kfreebsd-amd64
@@ -21,6 +21,7 @@ usr/lib/vlc/access/libcdda_plugin.so
 usr/lib/vlc/access/libdvdnav_plugin.so
 usr/lib/vlc/access/libdvdread_plugin.so
 usr/lib/vlc/access/librtp_plugin.so
+usr/lib/vlc/access/libv4l2_plugin.so
 usr/lib/vlc/access/libvcd_plugin.so
 usr/lib/vlc/access/libvcdx_plugin.so
 usr/lib/vlc/access/libzip_plugin.so
diff --git a/debian/vlc-nox.install.kfreebsd-i386 b/debian/vlc-nox.install.kfreebsd-i386
index 399f59b..791d48c 100644
--- a/debian/vlc-nox.install.kfreebsd-i386
+++ b/debian/vlc-nox.install.kfreebsd-i386
@@ -21,6 +21,7 @@ usr/lib/vlc/access/libcdda_plugin.so
 usr/lib/vlc/access/libdvdnav_plugin.so
 usr/lib/vlc/access/libdvdread_plugin.so
 usr/lib/vlc/access/librtp_plugin.so
+usr/lib/vlc/access/libv4l2_plugin.so
 usr/lib/vlc/access/libvcd_plugin.so
 usr/lib/vlc/access/libvcdx_plugin.so
 usr/lib/vlc/access/libzip_plugin.so
diff --git a/doc/vlc.1 b/doc/vlc.1
index 5acc0b5..45f0d0c 100644
--- a/doc/vlc.1
+++ b/doc/vlc.1
@@ -70,11 +70,6 @@ Execute a playlist command. Commands are:
 (close VLC).
 
 .SH SEE ALSO
-The
-.B videolan-doc
-package contains comprehensive documents on how to use
-.B VLC
-both as a media player and as a streaming server.
 Online documentation: http://www.videolan.org/doc/
 .PP
 .SH AUTHOR
diff --git a/modules/codec/libass.c b/modules/codec/libass.c
index bb28ef3..93f8fb5 100644
--- a/modules/codec/libass.c
+++ b/modules/codec/libass.c
@@ -48,14 +48,6 @@
 #   include <vlc_charset.h>
 #endif
 
-/* Compatibility with old libass */
-#if !defined(LIBASS_VERSION) || LIBASS_VERSION < 0x00907010
-#   define ASS_Renderer    ass_renderer_t
-#   define ASS_Library     ass_library_t
-#   define ASS_Track       ass_track_t
-#   define ASS_Image       ass_image_t
-#endif
-
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -81,13 +73,13 @@ static void UpdateRegions( spu_t *,
                            subpicture_t *, const video_format_t *, mtime_t );
 
 /* Yes libass sux with threads */
-typedef struct
+typedef struct 
 {
     vlc_object_t   *p_libvlc;
 
     int             i_refcount;
-    ASS_Library     *p_library;
-    ASS_Renderer    *p_renderer;
+    ass_library_t   *p_library;
+    ass_renderer_t  *p_renderer;
     video_format_t  fmt;
 } ass_handle_t;
 static ass_handle_t *AssHandleHold( decoder_t *p_dec );
@@ -106,7 +98,7 @@ struct decoder_sys_t
     ass_handle_t *p_ass;
 
     /* */
-    ASS_Track    *p_track;
+    ass_track_t  *p_track;
 
     /* */
     subpicture_t *p_spu_final;
@@ -130,9 +122,9 @@ typedef struct
     int y1;
 } rectangle_t;
 
-static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region, ASS_Image *p_img_list, int i_width, int i_height );
+static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region, ass_image_t *p_img_list, int i_width, int i_height );
 static void SubpictureReleaseRegions( spu_t *p_spu, subpicture_t *p_subpic );
-static void RegionDraw( subpicture_region_t *p_region, ASS_Image *p_img );
+static void RegionDraw( subpicture_region_t *p_region, ass_image_t *p_img );
 
 static vlc_mutex_t libass_lock = VLC_STATIC_MUTEX;
 
@@ -145,7 +137,7 @@ static int Create( vlc_object_t *p_this )
 {
     decoder_t *p_dec = (decoder_t *)p_this;
     decoder_sys_t *p_sys;
-    ASS_Track *p_track;
+    ass_track_t *p_track;
 
     if( p_dec->fmt_in.i_codec != VLC_FOURCC('s','s','a',' ') )
         return VLC_EGENERIC;
@@ -369,8 +361,8 @@ static void UpdateRegions( spu_t *p_spu, subpicture_t *p_subpic,
     /* */
     const mtime_t i_stream_date = p_subpic->p_sys->i_pts + (i_ts - p_subpic->i_start);
     int i_changed;
-    ASS_Image *p_img = ass_render_frame( p_ass->p_renderer, p_sys->p_track,
-                                         i_stream_date/1000, &i_changed );
+    ass_image_t *p_img = ass_render_frame( p_ass->p_renderer, p_sys->p_track,
+                                           i_stream_date/1000, &i_changed );
 
     if( !i_changed && !b_fmt_changed &&
         (p_img != NULL) == (p_subpic->p_region != NULL) )
@@ -438,7 +430,7 @@ static rectangle_t r_create( int x0, int y0, int x1, int y1 )
     rectangle_t r = { x0, y0, x1, y1 };
     return r;
 }
-static rectangle_t r_img( const ASS_Image *p_img )
+static rectangle_t r_img( const ass_image_t *p_img )
 {
     return r_create( p_img->dst_x, p_img->dst_y, p_img->dst_x+p_img->w, p_img->dst_y+p_img->h );
 }
@@ -459,9 +451,9 @@ static bool r_overlap( const rectangle_t *a, const rectangle_t *b, int i_dx, int
             __MAX(a->y0-i_dy, b->y0) < __MIN( a->y1+i_dy, b->y1 );
 }
 
-static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region, ASS_Image *p_img_list, int i_width, int i_height )
+static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region, ass_image_t *p_img_list, int i_width, int i_height )
 {
-    ASS_Image *p_tmp;
+    ass_image_t *p_tmp;
     int i_count;
 
     VLC_UNUSED(p_spu);
@@ -475,7 +467,7 @@ static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region,
     if( i_count <= 0 )
         return 0;
 
-    ASS_Image **pp_img = calloc( i_count, sizeof(*pp_img) );
+    ass_image_t **pp_img = calloc( i_count, sizeof(*pp_img) );
     if( !pp_img )
         return 0;
 
@@ -508,7 +500,7 @@ static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region,
             b_ok = false;
             for( n = 0; n < i_count; n++ )
             {
-                ASS_Image *p_img = pp_img[n];
+                ass_image_t *p_img = pp_img[n];
                 if( !p_img )
                     continue;
                 rectangle_t r = r_img( p_img );
@@ -584,7 +576,7 @@ static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region,
     return i_region;
 }
 
-static void RegionDraw( subpicture_region_t *p_region, ASS_Image *p_img )
+static void RegionDraw( subpicture_region_t *p_region, ass_image_t *p_img )
 {
     const plane_t *p = &p_region->p_picture->p[0];
     const int i_x = p_region->i_x;
@@ -599,41 +591,26 @@ static void RegionDraw( subpicture_region_t *p_region, ASS_Image *p_img )
             p_img->dst_y < i_y || p_img->dst_y + p_img->h > i_y + i_height )
             continue;
 
-        const unsigned r = (p_img->color >> 24)&0xff;
-        const unsigned g = (p_img->color >> 16)&0xff;
-        const unsigned b = (p_img->color >>  8)&0xff;
-        const unsigned a = (p_img->color      )&0xff;
+        const int r = (p_img->color >> 24)&0xff;
+        const int g = (p_img->color >> 16)&0xff;
+        const int b = (p_img->color >>  8)&0xff;
+        const int a = (p_img->color      )&0xff;
         int x, y;
 
         for( y = 0; y < p_img->h; y++ )
         {
             for( x = 0; x < p_img->w; x++ )
             {
-                const unsigned alpha = p_img->bitmap[y*p_img->stride+x];
-                const unsigned an = (255 - a) * alpha / 255;
+                const int alpha = p_img->bitmap[y*p_img->stride+x];
+                const int an = (255 - a) * alpha / 255;
 
                 uint8_t *p_rgba = &p->p_pixels[(y+p_img->dst_y-i_y) * p->i_pitch + 4 * (x+p_img->dst_x-i_x)];
-                const unsigned ao = p_rgba[3];
 
                 /* Native endianness, but RGBA ordering */
-                if( ao == 0 )
-                {
-                    /* Optimized but the else{} will produce the same result */
-                    p_rgba[0] = r;
-                    p_rgba[1] = g;
-                    p_rgba[2] = b;
-                    p_rgba[3] = an;
-                }
-                else
-                {
-                    p_rgba[3] = 255 - ( 255 - p_rgba[3] ) * ( 255 - an ) / 255;
-                    if( p_rgba[3] != 0 )
-                    {
-                        p_rgba[0] = ( p_rgba[0] * ao * (255-an) / 255 + r * an ) / p_rgba[3];
-                        p_rgba[1] = ( p_rgba[1] * ao * (255-an) / 255 + g * an ) / p_rgba[3];
-                        p_rgba[2] = ( p_rgba[2] * ao * (255-an) / 255 + b * an ) / p_rgba[3];
-                    }
-                }
+                p_rgba[0] = ( p_rgba[0] * (255-an) + r * an ) / 255;
+                p_rgba[1] = ( p_rgba[1] * (255-an) + g * an ) / 255;
+                p_rgba[2] = ( p_rgba[2] * (255-an) + b * an ) / 255;
+                p_rgba[3] = 255 - ( 255 - p_rgba[3] ) * ( 255 - an ) / 255;
             }
         }
     }
@@ -663,8 +640,8 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec )
     vlc_mutex_lock( &libass_lock );
 
     ass_handle_t *p_ass = NULL;
-    ASS_Library *p_library = NULL;
-    ASS_Renderer *p_renderer = NULL;
+    ass_library_t *p_library = NULL;
+    ass_renderer_t *p_renderer = NULL;
     vlc_value_t val;
 
     var_Create( p_dec->p_libvlc, "libass-handle", VLC_VAR_ADDRESS );
@@ -754,8 +731,7 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec )
     ass_set_fonts_dir( p_library, psz_font_dir );
     free( psz_font_dir );
 #ifdef WIN32
-    if( p_dialog )
-        dialog_ProgressSet( p_dialog, NULL, 0.1 );
+    dialog_ProgressSet( p_dialog, NULL, 0.1 );
 #endif
 
     ass_set_extract_fonts( p_library, true );
@@ -778,8 +754,7 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec )
 
 #ifdef HAVE_FONTCONFIG
 #ifdef WIN32
-    if( p_dialog )
-        dialog_ProgressSet( p_dialog, NULL, 0.2 );
+    dialog_ProgressSet( p_dialog, NULL, 0.2 );
 #endif
 #if defined( LIBASS_VERSION ) && LIBASS_VERSION >= 0x00907000
     ass_set_fonts( p_renderer, psz_font, psz_family, true, NULL, 1 );  // setup default font/family
@@ -787,8 +762,7 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec )
     ass_set_fonts( p_renderer, psz_font, psz_family );  // setup default font/family
 #endif
 #ifdef WIN32
-    if( p_dialog )
-        dialog_ProgressSet( p_dialog, NULL, 1.0 );
+    dialog_ProgressSet( p_dialog, NULL, 1.0 );
 #endif
 #else
     /* FIXME you HAVE to give him a font if no fontconfig */
@@ -807,8 +781,7 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec )
     /* */
     vlc_mutex_unlock( &libass_lock );
 #ifdef WIN32
-    if( p_dialog )
-        dialog_ProgressDestroy( p_dialog );
+    dialog_ProgressDestroy( p_dialog );
 #endif
     return p_ass;
 
@@ -844,3 +817,4 @@ static void AssHandleRelease( ass_handle_t *p_ass )
     vlc_mutex_unlock( &libass_lock );
     free( p_ass );
 }
+
diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 3a0ef51..d4514e4 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -60,7 +60,7 @@
 #define DEFAULT_FONT "" /* Default font found at run-time */
 #define FC_DEFAULT_FONT "Arial"
 #else
-#define DEFAULT_FONT "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf"
+#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
 #define FC_DEFAULT_FONT "Serif Bold"
 #endif
 
diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index b016ae3..5d364ac 100644
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -698,10 +698,6 @@ static int OpenClient (vlc_object_t *obj)
         sprintf (path, "%s/ssl/certs/ca-certificates.crt", confdir);
         gnutls_Addx509File (VLC_OBJECT (p_session),
                             p_sys->x509_cred, path, false);
-    gnutls_Addx509File( VLC_OBJECT(p_session),
-                        p_sys->x509_cred,
-                        "/etc/ssl/certs/ca-certificates.crt",false );
-
     }
     p_session->pf_handshake = gnutls_HandshakeAndValidate;
     /*p_session->pf_handshake = gnutls_ContinueHandshake;*/
diff --git a/modules/misc/notify/notify.c b/modules/misc/notify/notify.c
index 21803be..4f1fc06 100644
--- a/modules/misc/notify/notify.c
+++ b/modules/misc/notify/notify.c
@@ -231,7 +231,12 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
     else /* else we show state-of-the art logo */
     {
         GError *p_error = NULL;
-        pix = gdk_pixbuf_new_from_file( "/usr/share/pixmaps/vlc.png", &p_error );
+        char *psz_pixbuf;
+        if( asprintf( &psz_pixbuf, "%s/vlc48x48.png", config_GetDataDir() ) >= 0 )
+        {
+            pix = gdk_pixbuf_new_from_file( psz_pixbuf, &p_error );
+            free( psz_pixbuf );
+        }
     }
 
     free( psz_arturl );
diff --git a/modules/video_chroma/i420_rgb_mmx.h b/modules/video_chroma/i420_rgb_mmx.h
index 587ba33..cb7a9d8 100644
--- a/modules/video_chroma/i420_rgb_mmx.h
+++ b/modules/video_chroma/i420_rgb_mmx.h
@@ -34,18 +34,18 @@
 #define USED_U64(foo) \
     static const uint64_t foo __asm__ (#foo) __attribute__((unused))
 #endif
-USED_U64(mmx_80w)     = 0x0080008000800080ULL; /* Will be referenced as %4 in inline asm */
-USED_U64(mmx_10w)     = 0x1010101010101010ULL; /* -- as %5 */
-USED_U64(mmx_00ffw)   = 0x00ff00ff00ff00ffULL; /* -- as %6 */
-USED_U64(mmx_Y_coeff) = 0x253f253f253f253fULL; /* -- as %7 */
-
-USED_U64(mmx_U_green) = 0xf37df37df37df37dULL; /* -- as %8 */
-USED_U64(mmx_U_blue)  = 0x4093409340934093ULL; /* -- as %9 */
-USED_U64(mmx_V_red)   = 0x3312331233123312ULL; /* -- as %10 */
-USED_U64(mmx_V_green) = 0xe5fce5fce5fce5fcULL; /* -- as %11 */
-
-USED_U64(mmx_mask_f8) = 0xf8f8f8f8f8f8f8f8ULL; /* -- as %12 */
-USED_U64(mmx_mask_fc) = 0xfcfcfcfcfcfcfcfcULL; /* -- as %13 */
+USED_U64(mmx_80w)     = 0x0080008000800080ULL;
+USED_U64(mmx_10w)     = 0x1010101010101010ULL;
+USED_U64(mmx_00ffw)   = 0x00ff00ff00ff00ffULL;
+USED_U64(mmx_Y_coeff) = 0x253f253f253f253fULL;
+
+USED_U64(mmx_U_green) = 0xf37df37df37df37dULL;
+USED_U64(mmx_U_blue)  = 0x4093409340934093ULL;
+USED_U64(mmx_V_red)   = 0x3312331233123312ULL;
+USED_U64(mmx_V_green) = 0xe5fce5fce5fce5fcULL;
+
+USED_U64(mmx_mask_f8) = 0xf8f8f8f8f8f8f8f8ULL;
+USED_U64(mmx_mask_fc) = 0xfcfcfcfcfcfcfcfcULL;
 #undef USED_U64
 
 #if defined(CAN_COMPILE_MMX)
@@ -59,16 +59,18 @@ USED_U64(mmx_mask_fc) = 0xfcfcfcfcfcfcfcfcULL; /* -- as %13 */
         MMX_INSTRUCTIONS                \
         :                               \
         : "r" (p_y), "r" (p_u),         \
-          "r" (p_v), "r" (p_buffer),    \
-	  "m" (mmx_80w), "m" (mmx_10w), \
-	  "m" (mmx_00ffw), "m" (mmx_Y_coeff), \
-	  "m" (mmx_U_green), "m" (mmx_U_blue), \
-	  "m" (mmx_V_red), "m" (mmx_V_green), \
-	  "m" (mmx_mask_f8), "m" (mmx_mask_fc) );  \
+          "r" (p_v), "r" (p_buffer) );  \
     } while(0)
 
 #define MMX_END __asm__ __volatile__ ( "emms" )
 
+/* Use RIP-relative code in PIC mode on amd64 */
+#if defined(__x86_64__) && defined(__PIC__)
+#   define G "(%%rip)"
+#else
+#   define G
+#endif
+
 #define MMX_INIT_16 "                                                       \n\
 movd       (%1), %%mm0      # Load 4 Cb       00 00 00 00 u3 u2 u1 u0       \n\
 movd       (%2), %%mm1      # Load 4 Cr       00 00 00 00 v3 v2 v1 v0       \n\
@@ -101,27 +103,27 @@ movq      (%0), %%mm6       # Load 8 Y        Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0       \n\
 # convert the chroma part                                                   \n\
 punpcklbw %%mm4, %%mm0          # scatter 4 Cb    00 u3 00 u2 00 u1 00 u0   \n\
 punpcklbw %%mm4, %%mm1          # scatter 4 Cr    00 v3 00 v2 00 v1 00 v0   \n\
-psubsw    %4, %%mm0     # Cb -= 128                                 \n\
-psubsw    %4, %%mm1     # Cr -= 128                                 \n\
+psubsw    mmx_80w"G", %%mm0     # Cb -= 128                                 \n\
+psubsw    mmx_80w"G", %%mm1     # Cr -= 128                                 \n\
 psllw     $3, %%mm0             # Promote precision                         \n\
 psllw     $3, %%mm1             # Promote precision                         \n\
 movq      %%mm0, %%mm2          # Copy 4 Cb       00 u3 00 u2 00 u1 00 u0   \n\
 movq      %%mm1, %%mm3          # Copy 4 Cr       00 v3 00 v2 00 v1 00 v0   \n\
-pmulhw    %8, %%mm2 # Mul Cb with green coeff -> Cb green       \n\
-pmulhw    %11, %%mm3 # Mul Cr with green coeff -> Cr green       \n\
-pmulhw    %9, %%mm0  # Mul Cb -> Cblue 00 b3 00 b2 00 b1 00 b0   \n\
-pmulhw    %10, %%mm1   # Mul Cr -> Cred  00 r3 00 r2 00 r1 00 r0   \n\
+pmulhw    mmx_U_green"G", %%mm2 # Mul Cb with green coeff -> Cb green       \n\
+pmulhw    mmx_V_green"G", %%mm3 # Mul Cr with green coeff -> Cr green       \n\
+pmulhw    mmx_U_blue"G", %%mm0  # Mul Cb -> Cblue 00 b3 00 b2 00 b1 00 b0   \n\
+pmulhw    mmx_V_red"G", %%mm1   # Mul Cr -> Cred  00 r3 00 r2 00 r1 00 r0   \n\
 paddsw    %%mm3, %%mm2          # Cb green + Cr green -> Cgreen             \n\
                                                                             \n\
 # convert the luma part                                                     \n\
-psubusb   %5, %%mm6     # Y -= 16                                   \n\
+psubusb   mmx_10w"G", %%mm6     # Y -= 16                                   \n\
 movq      %%mm6, %%mm7          # Copy 8 Y        Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0   \n\
-pand      %6, %%mm6   # get Y even      00 Y6 00 Y4 00 Y2 00 Y0   \n\
+pand      mmx_00ffw"G", %%mm6   # get Y even      00 Y6 00 Y4 00 Y2 00 Y0   \n\
 psrlw     $8, %%mm7             # get Y odd       00 Y7 00 Y5 00 Y3 00 Y1   \n\
 psllw     $3, %%mm6             # Promote precision                         \n\
 psllw     $3, %%mm7             # Promote precision                         \n\
-pmulhw    %7, %%mm6 # Mul 4 Y even    00 y6 00 y4 00 y2 00 y0   \n\
-pmulhw    %7, %%mm7 # Mul 4 Y odd     00 y7 00 y5 00 y3 00 y1   \n\
+pmulhw    mmx_Y_coeff"G", %%mm6 # Mul 4 Y even    00 y6 00 y4 00 y2 00 y0   \n\
+pmulhw    mmx_Y_coeff"G", %%mm7 # Mul 4 Y odd     00 y7 00 y5 00 y3 00 y1   \n\
 "
 
 /*
@@ -166,14 +168,14 @@ punpcklbw %%mm5, %%mm2          #                 G7 G6 G5 G4 G3 G2 G1 G0   \n\
 
 #define MMX_YUV_GRAY "                                                      \n\
 # convert the luma part                                                     \n\
-psubusb   %5, %%mm6                                                 \n\
+psubusb   mmx_10w"G", %%mm6                                                 \n\
 movq      %%mm6, %%mm7                                                      \n\
-pand      %6, %%mm6                                               \n\
+pand      mmx_00ffw"G", %%mm6                                               \n\
 psrlw     $8, %%mm7                                                         \n\
 psllw     $3, %%mm6                                                         \n\
 psllw     $3, %%mm7                                                         \n\
-pmulhw    %7, %%mm6                                             \n\
-pmulhw    %7, %%mm7                                             \n\
+pmulhw    mmx_Y_coeff"G", %%mm6                                             \n\
+pmulhw    mmx_Y_coeff"G", %%mm7                                             \n\
 packuswb  %%mm6, %%mm6                                                      \n\
 packuswb  %%mm7, %%mm7                                                      \n\
 punpcklbw %%mm7, %%mm6                                                      \n\
@@ -181,8 +183,8 @@ punpcklbw %%mm7, %%mm6                                                      \n\
 
 #define MMX_UNPACK_16_GRAY "                                                \n\
 movq      %%mm6, %%mm5                                                      \n\
-pand      %12, %%mm6                                             \n\
-pand      %13, %%mm5                                             \n\
+pand      mmx_mask_f8"G", %%mm6                                             \n\
+pand      mmx_mask_fc"G", %%mm5                                             \n\
 movq      %%mm6, %%mm7                                                      \n\
 psrlw     $3, %%mm7                                                         \n\
 pxor      %%mm3, %%mm3                                                      \n\
@@ -211,10 +213,10 @@ movq      %%mm2, 8(%3)                                                      \n\
 
 #define MMX_UNPACK_15 "                                                     \n\
 # mask unneeded bits off                                                    \n\
-pand      %12, %%mm0 # b7b6b5b4 b3______ b7b6b5b4 b3______       \n\
+pand      mmx_mask_f8"G", %%mm0 # b7b6b5b4 b3______ b7b6b5b4 b3______       \n\
 psrlw     $3,%%mm0              # ______b7 b6b5b4b3 ______b7 b6b5b4b3       \n\
-pand      %12, %%mm2 # g7g6g5g4 g3______ g7g6g5g4 g3______       \n\
-pand      %12, %%mm1 # r7r6r5r4 r3______ r7r6r5r4 r3______       \n\
+pand      mmx_mask_f8"G", %%mm2 # g7g6g5g4 g3______ g7g6g5g4 g3______       \n\
+pand      mmx_mask_f8"G", %%mm1 # r7r6r5r4 r3______ r7r6r5r4 r3______       \n\
 psrlw     $1,%%mm1              # __r7r6r5 r4r3____ __r7r6r5 r4r3____       \n\
 pxor      %%mm4, %%mm4          # zero mm4                                  \n\
 movq      %%mm0, %%mm5          # Copy B7-B0                                \n\
@@ -247,9 +249,9 @@ movq      %%mm5, 8(%3)          # store pixel 4-7                           \n\
 
 #define MMX_UNPACK_16 "                                                     \n\
 # mask unneeded bits off                                                    \n\
-pand      %12, %%mm0 # b7b6b5b4 b3______ b7b6b5b4 b3______       \n\
-pand      %13, %%mm2 # g7g6g5g4 g3g2____ g7g6g5g4 g3g2____       \n\
-pand      %12, %%mm1 # r7r6r5r4 r3______ r7r6r5r4 r3______       \n\
+pand      mmx_mask_f8"G", %%mm0 # b7b6b5b4 b3______ b7b6b5b4 b3______       \n\
+pand      mmx_mask_fc"G", %%mm2 # g7g6g5g4 g3g2____ g7g6g5g4 g3g2____       \n\
+pand      mmx_mask_f8"G", %%mm1 # r7r6r5r4 r3______ r7r6r5r4 r3______       \n\
 psrlw     $3,%%mm0              # ______b7 b6b5b4b3 ______b7 b6b5b4b3       \n\
 pxor      %%mm4, %%mm4          # zero mm4                                  \n\
 movq      %%mm0, %%mm5          # Copy B7-B0                                \n\
diff --git a/modules/video_filter/osdmenu.c b/modules/video_filter/osdmenu.c
index e3962e1..544cfad 100644
--- a/modules/video_filter/osdmenu.c
+++ b/modules/video_filter/osdmenu.c
@@ -105,7 +105,7 @@ static int MouseEvent( vlc_object_t *, char const *,
 #if defined( WIN32 ) || defined( UNDER_CE )
 #define OSD_DEFAULT_CFG "osdmenu/default.cfg"
 #else
-#define OSD_DEFAULT_CFG "/usr/share/vlc/osdmenu/default.cfg"
+#define OSD_DEFAULT_CFG "share/osdmenu/default.cfg"
 #endif
 
 #define OSD_UPDATE_MIN     0
diff --git a/share/osdmenu/default.cfg b/share/osdmenu/default.cfg
index b72eeae..092c86c 100644
--- a/share/osdmenu/default.cfg
+++ b/share/osdmenu/default.cfg
@@ -1,4 +1,4 @@
-dir /usr/share/vlc/osdmenu/default
+dir share/osdmenu/default
 action	key-play-pause (0,0)
 	unselect unselected.png
 	select   selection/play_pause.png

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list