Commit f2ab6b69 authored by Sam Hocevar's avatar Sam Hocevar

* include/vlc_common.h:

    + Use PACKAGE_NAME instead of PACKAGE.
  * modules/codec/ffmpeg/ffmpeg.c:
    + This module does not require AltiVec for now.
parent b6db83fc
......@@ -38,6 +38,13 @@
#include "config.h"
#if !defined(PACKAGE_NAME)
# define PACKAGE_NAME PACKAGE
#endif
#if !defined(PACKAGE_VERSION)
# define PACKAGE_VERSION VERSION
#endif
#if defined( __BORLANDC__ )
# undef HAVE_VARIADIC_MACROS
# undef HAVE_STDINT_H
......@@ -929,17 +936,13 @@ VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
defined(MODULE_NAME_IS_pda))
/* Declare nothing: gnome.h will do it for us */
#elif defined( ENABLE_NLS )
#if defined( HAVE_INCLUDED_GETTEXT )
# include "libintl.h"
#else
# include <libintl.h>
#endif
# if defined( HAVE_INCLUDED_GETTEXT )
# include "libintl.h"
# else
# include <libintl.h>
# endif
# undef _
#if defined( __BORLANDC__ )
#define _(String) vlc_dgettext (PACKAGE_TARNAME, String)
#else
# define _(String) vlc_dgettext (PACKAGE, String)
#endif
# define _(String) vlc_dgettext (PACKAGE_NAME, String)
# define N_(String) ((char*)(String))
#else
# define _(String) ((char*)(String))
......
......@@ -81,7 +81,7 @@ vlc_module_begin();
#if defined(MODULE_NAME_is_ffmpegaltivec) \
|| (defined(CAN_COMPILE_ALTIVEC) && !defined(NO_ALTIVEC_IN_FFMPEG))
set_description( _("AltiVec ffmpeg audio/video decoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
add_requirement( ALTIVEC );
/*add_requirement( ALTIVEC );*/
set_capability( "decoder", 71 );
#else
set_description( _("ffmpeg audio/video decoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
......
......@@ -663,7 +663,7 @@ void Interface::OnExit( wxCommandEvent& WXUNUSED(event) )
void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
{
wxString msg;
msg.Printf( wxString(wxT("VLC media player " VERSION)) +
msg.Printf( wxString(wxT("VLC media player " PACKAGE_VERSION)) +
wxU(_(" (wxWindows interface)\n\n")) +
wxU(_("(c) 1996-2004 - the VideoLAN Team\n\n")) +
wxU( vlc_wraptext(INTF_ABOUT_MSG,WRAPCOUNT,ISUTF8) ) + wxT("\n\n") +
......
......@@ -725,7 +725,8 @@ static block_t *OggCreateHeader( sout_mux_t *p_mux, mtime_t i_dts )
/* comment */
com[0] = PACKET_TYPE_COMMENT;
i_com = snprintf( &com[1], 128, VERSION" stream output" ) + 1;
i_com = snprintf( &com[1], 128, PACKAGE_VERSION" stream output" )
+ 1;
op.packet = com;
op.bytes = i_com;
op.b_o_s = 0;
......
......@@ -408,10 +408,10 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
/* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") );
textdomain( PACKAGE );
textdomain( PACKAGE_NAME );
#if defined( ENABLE_UTF8 )
bind_textdomain_codeset( PACKAGE, "UTF-8" );
bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" );
#endif
module_EndBank( p_vlc );
......@@ -1758,17 +1758,17 @@ static void SetLanguage ( char const *psz_lang )
"locale" );
psz_path = psz_tmp;
#endif
if( !bindtextdomain( PACKAGE, psz_path ) )
if( !bindtextdomain( PACKAGE_NAME, psz_path ) )
{
fprintf( stderr, "warning: no domain %s in directory %s\n",
PACKAGE, psz_path );
PACKAGE_NAME, psz_path );
}
/* Set the default domain */
textdomain( PACKAGE );
textdomain( PACKAGE_NAME );
#if defined( ENABLE_UTF8 )
bind_textdomain_codeset( PACKAGE, "UTF-8" );
bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" );
#endif
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment