diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-06 22:57:14 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-06 22:57:14 +0000 |
| commit | 3829ecb1a2f4f3dfcb2a2c319e404b7eb5b7eb6d (patch) | |
| tree | d0cf51ba42195aad3a53ff9637e3e631e99d6cde | |
| parent | ff4a1ad4a9d610a85736e2b991e219e510151a02 (diff) | |
| download | mpv-3829ecb1a2f4f3dfcb2a2c319e404b7eb5b7eb6d.tar.bz2 mpv-3829ecb1a2f4f3dfcb2a2c319e404b7eb5b7eb6d.tar.xz | |
Remove remnants of long-gone libfame.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20739 b3059339-0415-0410-9bf9-f77b7e298cf2
35 files changed, 29 insertions, 324 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index f2c569a176..3b5905e4ee 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -5483,7 +5483,6 @@ You should see a red, green and blue stripe from top to bottom. .TP .B lavc[=quality:fps] Fast software YV12 to MPEG-1 conversion with libavcodec for use with DVB/\:DXR3/\:IVTV. -Faster and of better quality than \-vf fame. .RSs .IPs <quality> .RSss @@ -5496,10 +5495,6 @@ force output fps (float value) (default: 0, autodetect based on height) .RE . .TP -.B "fame\ \ \ " -Fast software YV12 to MPEG-1 conversion with libfame for use with DVB/\:DXR3/\:IVTV. -. -.TP .B dvbscale[=aspect] Set up optimal scaling for DVB cards, scaling the x axis in hardware and calculating the y axis scaling in software to keep aspect. diff --git a/DOCS/xml/en/video.xml b/DOCS/xml/en/video.xml index e615da5888..24bc9ea9d2 100644 --- a/DOCS/xml/en/video.xml +++ b/DOCS/xml/en/video.xml @@ -2000,16 +2000,13 @@ This does not work with digital audio output (<option>-ac hwac3</option>). </varlistentry> <varlistentry> -<term><option>-vf lavc/fame</option></term> +<term><option>-vf lavc</option></term> <listitem><para> To watch non-MPEG content on the em8300 (i.e. MPEG-4 (DivX) or RealVideo) you have to specify an MPEG-1 video filter such as -<systemitem class="library">libavcodec</systemitem> (lavc) or -<systemitem class="library">libfame</systemitem> (fame). At -the moment lavc is both faster and gives better image quality, it is suggested -that you use that unless you have problems with it. See the man page for further -info about <option>-vf lavc/fame</option>. -Using lavc is highly recommended. Currently there is no way of setting the fps +<systemitem class="library">libavcodec</systemitem> (lavc). +See the man page for further info about <option>-vf lavc</option>. +Currently there is no way of setting the fps of the em8300 which means that it is fixed to 30000/1001 fps. Because of this it is highly recommended that you use <option>-vf lavc=<replaceable>quality</replaceable>:25</option> especially if you are using prebuffering. Then why 25 and not 30000/1001? Well, the @@ -26,9 +26,6 @@ int gtkVopPP = 0; #ifdef USE_LIBAVCODEC int gtkVopLAVC = 0; #endif -#ifdef USE_LIBFAME - int gtkVopFAME = 0; -#endif int gtkAONorm = 0; int gtkAOSurround = 0; @@ -110,9 +107,6 @@ static m_option_t gui_opts[] = #ifdef USE_LIBAVCODEC { "vf_lavc",>kVopLAVC,CONF_TYPE_FLAG,0,0,1,NULL }, #endif -#ifdef USE_LIBFAME - { "vf_fame",>kVopFAME,CONF_TYPE_FLAG,0,0,1,NULL }, -#endif { "ao_driver",&audio_driver_list,CONF_TYPE_STRING_LIST,0,0,0,NULL }, { "ao_volnorm",>kAONorm,CONF_TYPE_FLAG,0,0,1,NULL }, @@ -6,7 +6,6 @@ extern int gtkEnableAudioEqualizer; extern int gtkVopPP; extern int gtkVopLAVC; -extern int gtkVopFAME; extern int gtkAONorm; extern int gtkAOFakeSurround; diff --git a/Gui/interface.c b/Gui/interface.c index 00b12837a5..a05458f613 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -732,12 +732,9 @@ int guiGetEvent( int type,char * arg ) #ifdef USE_LIBAVCODEC && !gtkVopLAVC #endif -#ifdef USE_LIBFAME - && !gtkVopFAME -#endif ) { - gtkMessageBox( GTK_MB_FATAL,MSGTR_NEEDLAVCFAME ); + gtkMessageBox( GTK_MB_FATAL,MSGTR_NEEDLAVC ); guiIntfStruct.Playing=0; return True; } @@ -823,9 +820,6 @@ int guiGetEvent( int type,char * arg ) #ifdef USE_LIBAVCODEC remove_vop( "lavc" ); #endif -#ifdef USE_LIBFAME - remove_vop( "fame" ); -#endif if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) ) { if ( ( guiIntfStruct.StreamType != STREAMTYPE_DVD)&&( guiIntfStruct.StreamType != STREAMTYPE_VCD ) ) @@ -833,9 +827,6 @@ int guiGetEvent( int type,char * arg ) #ifdef USE_LIBAVCODEC if ( gtkVopLAVC ) add_vop( "lavc" ); #endif -#ifdef USE_LIBFAME - if ( gtkVopFAME ) add_vop( "fame" ); -#endif } } #endif diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c index 6c1af1973c..4b3b45b4b8 100644 --- a/Gui/mplayer/gtk/opts.c +++ b/Gui/mplayer/gtk/opts.c @@ -1714,9 +1714,6 @@ static GtkWidget * RBVNone; #ifdef USE_LIBAVCODEC static GtkWidget * RBVLavc; #endif -#ifdef USE_LIBFAME - static GtkWidget * RBVFame; -#endif static GtkWidget * dxr3BOk; static GtkWidget * dxr3BCancel; @@ -1733,10 +1730,7 @@ void ShowDXR3Config( void ) #ifdef USE_LIBAVCODEC if ( gtkVopLAVC ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBVLavc ),TRUE ); #endif -#ifdef USE_LIBFAME - if ( gtkVopFAME ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBVFame ),TRUE ); -#endif - + gtk_widget_show( DXR3Config ); gtkSetLayer( DXR3Config ); } @@ -1758,9 +1752,6 @@ static void dxr3Button( GtkButton * button,gpointer user_data ) #ifdef USE_LIBAVCODEC gtkVopLAVC=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBVLavc ) ); #endif -#ifdef USE_LIBFAME - gtkVopFAME=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBVFame ) ); -#endif case 1: // Cancel HideDXR3Config(); break; @@ -1813,7 +1804,7 @@ GtkWidget * create_DXR3Config( void ) gtk_widget_show( CEDXR3Device ); gtk_entry_set_text( GTK_ENTRY( CEDXR3Device ),"/dev/em8300" ); -#if defined( USE_LIBAVCODEC ) || defined( USE_LIBFAME ) +#if defined( USE_LIBAVCODEC ) AddHSeparator( vbox2 ); vbox3=AddVBox( vbox2,0 ); AddLabel( MSGTR_PREFERENCES_DXR3_VENC,vbox3 ); @@ -1821,9 +1812,6 @@ GtkWidget * create_DXR3Config( void ) #ifdef USE_LIBAVCODEC RBVLavc=AddRadioButton( MSGTR_PREFERENCES_DXR3_LAVC,&VEncoder_group,vbox3 ); #endif -#ifdef USE_LIBFAME - RBVFame=AddRadioButton( MSGTR_PREFERENCES_DXR3_FAME,&VEncoder_group,vbox3 ); -#endif #endif @@ -111,9 +111,6 @@ endif ifeq ($(VIDIX),yes) PARTS += libdha vidix endif -ifeq ($(FAME),yes) -PARTS += libfame -endif ifeq ($(DVDREAD_INTERNAL),yes) PARTS += libdvdread PARTS += libdvdcss @@ -170,9 +167,6 @@ endif ifeq ($(VIDIX),yes) COMMON_DEPS += libdha/libdha.so vidix/libvidix.a endif -ifeq ($(FAME),yes) -COMMON_DEPS += libfame/libfame.a -endif ifeq ($(DVDREAD_INTERNAL),yes) COMMON_DEPS += libdvdread/libdvdread.a COMMON_LIBS += libdvdread/libdvdread.a @@ -216,9 +210,6 @@ libdvdcss/libdvdcss.a: loader/libloader.a: $(MAKE) -C loader -libfame/libfame.a: - $(MAKE) -C libfame - libass/libass.a: $(MAKE) -C libass @@ -286,7 +286,6 @@ Codecs: --disable-libpostproc_so disable shared libpostproc [autodetect] --disable-libavcodec_mpegaudio_hp disable high precision audio decoding in libavcodec [enabled] - --enable-libfame enable libfame realtime encoder [autodetect] --disable-tremor-internal disable internal Tremor [enabled] --enable-tremor-low enable lower accuracy internal Tremor [disabled] --enable-tremor-external enable external Tremor [autodetect] @@ -1564,7 +1563,6 @@ _libavformat_so=auto _libpostproc=auto _libpostproc_so=auto _libavcodec_mpegaudio_hp=yes -_libfame=auto _mencoder=yes _x11=auto _xshape=auto @@ -1959,8 +1957,6 @@ for ac_option do --enable-libavcodec_mpegaudio_hp) _libavcodec_mpegaudio_hp=yes ;; --disable-libavcodec_mpegaudio_hp) _libavcodec_mpegaudio_hp=no ;; - --enable-libfame) _libfame=yes ;; - --disable-libfame) _libfame=no ;; --enable-lirc) _lirc=yes ;; --disable-lirc) _lirc=no ;; --enable-lircc) _lircc=yes ;; @@ -4740,30 +4736,6 @@ fi echores "$_ivtv" -echocheck "libfame" -if test "$_libfame" = auto ; then - _libfame=no - test "$_dxr2" = yes && _libfame=auto - test "$_dxr3" = yes && _libfame=auto - test "$_dvb" = yes && _libfame=auto -fi -if test "$_libfame" = auto ; then - _libfame=no - if test -d libfame && test -f libfame/fame.h ; then - # disable libfame on Cygwin as porting makes no sense - cygwin || _libfame=yes - else - _res_comment="no libfame dir" - fi -fi -echores "$_libfame" - -_def_libfame='#undef USE_LIBFAME' -if test "$_libfame" = yes ; then - _def_libfame='#define USE_LIBFAME 1' - _ld_libfame='libfame/libfame.a' -fi - ######### # AUDIO # @@ -7423,7 +7395,7 @@ EXTRA_LIB = $_ld_extra $_ld_live $_ld_vstream $_ld_network $_ld_enca \ $_ld_static $_ld_zlib $_ld_termcap $_ld_lirc $_ld_lircc $_ld_win32 \ $_ld_win32libs $_ld_lm $_ld_libC $_ld_fribidi $_ld_smb $_ld_gif \ $_ld_libcdio $_ld_dvdread $_ld_dvdnav $_macosx_frameworks $_ld_cdparanoia \ - $_ld_libfame $_ld_xvid $_ld_x264 $_ld_mp3lame $_ld_libdts $_ld_mad \ + $_ld_xvid $_ld_x264 $_ld_mp3lame $_ld_libdts $_ld_mad \ $_ld_vorbis $_ld_libdv $_ld_theora $_ld_faad $_ld_speex $_xmms_lib \ $_toolame_lib $_twolame_lib $_ld_faac $_ld_musepack $_ld_liblzo $_ld_png \ $_ld_jpeg $_ld_alsa $_ld_nut $_ld_arch $_ld_iconv $_ld_mlib @@ -7486,7 +7458,6 @@ CONFIG_LIBAVFORMAT_SO = $_libavformat_so CONFIG_LIBPOSTPROC = $_libpostproc CONFIG_LIBPOSTPROC_SO = $_libpostproc_so ZORAN = $_zr -FAME = $_libfame LIBDV = $_libdv XVID = $_xvid XVID4 = $_xvid4 @@ -7909,9 +7880,6 @@ $_def_liba52 $_def_libdts $_def_libmpeg2 -/* Use libfame encoder filter */ -$_def_libfame - /* XAnim DLL support */ $_def_xanim /* Default search path */ diff --git a/help/help_mp-bg.h b/help/help_mp-bg.h index 07df6ea7ab..b4345a91da 100644 --- a/help/help_mp-bg.h +++ b/help/help_mp-bg.h @@ -613,7 +613,7 @@ static char help_text[]= #define MSGTR_NEMDB "За съжаление, няма достатъчно памет за draw buffer." #define MSGTR_NEMFMR "За съжаление, няма достатъчно памет за менюто." #define MSGTR_IDFGCVD "За съжаление, няма съвместим с GUI видео драйвер." -#define MSGTR_NEEDLAVCFAME "За съжаление, не можете да възпроизвеждате различни от MPEG\nфайлове с вашето DXR3/H+ устройство без прекодиране.\nМоля разрешете lavc или fame в полето за конфигурация на DXR3/H+ ." +#define MSGTR_NEEDLAVC "За съжаление, не можете да възпроизвеждате различни от MPEG\nфайлове с вашето DXR3/H+ устройство без прекодиране.\nМоля разрешете lavc в полето за конфигурация на DXR3/H+ ." #define MSGTR_UNKNOWNWINDOWTYPE "Неизвестен тип на прозорец ..." // --- skin loader error messages @@ -767,7 +767,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "Не забравяйте, да рестартирате възпроизвеждането за да влязат в сила някои опции!" #define MSGTR_PREFERENCES_DXR3_VENC "Видео енкодер:" #define MSGTR_PREFERENCES_DXR3_LAVC "Използване на LAVC (FFmpeg)" -#define MSGTR_PREFERENCES_DXR3_FAME "Използване на FAME" #define MSGTR_PREFERENCES_FontEncoding1 "Unicode" #define MSGTR_PREFERENCES_FontEncoding2 "Западноевропейски Езици (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Западноевропейски Езици със Euro (ISO-8859-15)" diff --git a/help/help_mp-cs.h b/help/help_mp-cs.h index 7c5bebbefa..7bb2e1b698 100644 --- a/help/help_mp-cs.h +++ b/help/help_mp-cs.h @@ -711,7 +711,7 @@ static char help_text[]= #define MSGTR_NEMDB "Bohužel není dostatek paměti pro vykreslovací mezipaměť." #define MSGTR_NEMFMR "Bohužel není dostatek paměti pro vykreslení menu." #define MSGTR_IDFGCVD "Bohužel nebyl nalezen video ovladač kompatibilní s GUI." -#define MSGTR_NEEDLAVCFAME "Bohužel nelze přehrávat ne-MPEG s kartou DXR3/H+ bez přeenkódování.\nProsím, zapněte lavc nebo fame v konfiguraci DXR3/H+." +#define MSGTR_NEEDLAVC "Bohužel nelze přehrávat ne-MPEG s kartou DXR3/H+ bez přeenkódování.\nProsím, zapněte lavc v konfiguraci DXR3/H+." #define MSGTR_UNKNOWNWINDOWTYPE "Nalezen neznámý typ okna ..." // --- skin loader error messages @@ -875,7 +875,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "Pozor, některá nastavení potřebují pro svou funkci restartovat přehrávání!" #define MSGTR_PREFERENCES_DXR3_VENC "Video enkodér:" #define MSGTR_PREFERENCES_DXR3_LAVC "Použít LAVC (FFmpeg)" -#define MSGTR_PREFERENCES_DXR3_FAME "Použít FAME" #define MSGTR_PREFERENCES_FontEncoding1 "Unicode" #define MSGTR_PREFERENCES_FontEncoding2 "Západoevropské jazyky (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Západoevropské jazyky s Eurem (ISO-8859-15)" @@ -1559,9 +1558,6 @@ static char help_text[]= #define MSGTR_MPCODECS_WarnNextFilterDoesntSupportSlices "Varování! Další filtr nepodporuje SLICES, očekávejte sig11...\n" #define MSGTR_MPCODECS_FunWhydowegetNULL "Proč jsme dostali NULL??\n" -// libmpcodecs/vf_fame.c -#define MSGTR_MPCODECS_FatalCantOpenlibFAME "Fatální chyba: Nelze otevřít libFAME!\n" - // libmpcodecs/vf_test.c, vf_yuy2.c, vf_yvu9.c #define MSGTR_MPCODECS_WarnNextFilterDoesntSupport "%s není dalším filtrem/vo podporován :(\n" diff --git a/help/help_mp-de.h b/help/help_mp-de.h index ef8afc2993..0cf0390943 100644 --- a/help/help_mp-de.h +++ b/help/help_mp-de.h @@ -733,7 +733,7 @@ static char help_text[]= #define MSGTR_NEMDB "Sorry, nicht genug Speicher zum Zeichnen des Puffers." #define MSGTR_NEMFMR "Sorry, nicht genug Speicher für Menü-Rendering." #define MSGTR_IDFGCVD "Sorry, habe keinen GUI-kompatiblen Ausgabetreiber gefunden." -#define MSGTR_NEEDLAVCFAME "Sorry, du versuchst, Nicht-MPEG Dateien ohne erneute Encodierung abzuspielen.\nBitte aktiviere lavc oder fame in der DXR3/H+-Konfigurationsbox." +#define MSGTR_NEEDLAVC "Sorry, du versuchst, Nicht-MPEG Dateien ohne erneute Encodierung abzuspielen.\nBitte aktiviere lavc in der DXR3/H+-Konfigurationsbox." #define MSGTR_UNKNOWNWINDOWTYPE "Unbekannten Fenstertyp gefunden ..." // --- skin loader error messages @@ -897,7 +897,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "Bitte bedenke, dass manche Optionen einen Neustart der Wiedergabe erfordern." #define MSGTR_PREFERENCES_DXR3_VENC "Videoencoder:" #define MSGTR_PREFERENCES_DXR3_LAVC "Verwende LAVC (FFmpeg)" -#define MSGTR_PREFERENCES_DXR3_FAME "Verwende FAME" #define MSGTR_PREFERENCES_FontEncoding1 "Unicode" #define MSGTR_PREFERENCES_FontEncoding2 "Westeuropäische Sprachen (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Westeuropäische Sprachen mit Euro (ISO-8859-15)" @@ -1628,9 +1627,6 @@ static char help_text[]= #define MSGTR_MPCODECS_WarnNextFilterDoesntSupportSlices "WARNUNG! Nächster Filter unterstützt SLICES nicht, bereite dich auf sig11 vor...\n" #define MSGTR_MPCODECS_FunWhydowegetNULL "Wieso bekommen wir NULL??\n" -// libmpcodecs/vf_fame.c -#define MSGTR_MPCODECS_FatalCantOpenlibFAME "FATAL: Kann libFAME nicht öffnen!\n" - // libmpcodecs/vf_test.c, vf_yuy2.c, vf_yvu9.c #define MSGTR_MPCODECS_WarnNextFilterDoesntSupport "%s vom nächsten Filter/vo nicht unterstützt :(\n" diff --git a/help/help_mp-dk.h b/help/help_mp-dk.h index a44bcf38fb..46e933a106 100644 --- a/help/help_mp-dk.h +++ b/help/help_mp-dk.h @@ -369,7 +369,7 @@ static char help_text[]= #define MSGTR_NEMDB "Desværre, ikke nok ram til at vise bufferen." #define MSGTR_NEMFMR "Desværre, ikke nok ram til at vise menuen." #define MSGTR_IDFGCVD "Desværre, kunne ikke finde GUI kompabitel video driver." -#define MSGTR_NEEDLAVCFAME "For at afspille ikke-mpeg filer med dit DXR3/H+ skal du kode filmen igen.\nVenligst aktiver lavc eller fame i DXR3/H+ configboxen." +#define MSGTR_NEEDLAVC "For at afspille ikke-mpeg filer med dit DXR3/H+ skal du kode filmen igen.\nVenligst aktiver lavc i DXR3/H+ configboxen." // --- skin loader error messages #define MSGTR_SKIN_ERRORMESSAGE "[tema] fejl i konfigurationsfilen til temaet på linje %d: %s" @@ -514,7 +514,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "Husk, nogle funktioner kræver at MPlayer bliver genstartet for at de virker." #define MSGTR_PREFERENCES_DXR3_VENC "Video enkoder:" #define MSGTR_PREFERENCES_DXR3_LAVC "Brug LAVC (FFmpeg)" -#define MSGTR_PREFERENCES_DXR3_FAME "Brug FAME" #define MSGTR_PREFERENCES_FontEncoding1 "Unicode" #define MSGTR_PREFERENCES_FontEncoding2 "Vesteuropæriske sprog (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Vesteuropæriske sprog med euro (ISO-8859-15)" diff --git a/help/help_mp-el.h b/help/help_mp-el.h index 023201fa47..4fd5231a6b 100644 --- a/help/help_mp-el.h +++ b/help/help_mp-el.h @@ -381,7 +381,7 @@ static char help_text[]= #define MSGTR_NEMDB "Λυπάμαι, δεν υπάρχει αρκετή μνήμη για εγγραφή στον buffer." #define MSGTR_NEMFMR "Λυπάμαι, δεν υπάρχει αρκετή μνήμη για την εμφάνιση του μενού." #define MSGTR_IDFGCVD "Λυπάμαι, δεν βρέθηκε οδηγός εξόδου βίντεο που να είναι συμβατός με το GUI." -#define MSGTR_NEEDLAVCFAME "Λυπάμαι, δεν μπορείτε να αναπαράγετε αρχεία που δεν είναι mpeg με τη συσκευή DXR3/H+ χωρίς επανακωδικοποίηση.\n Παρακαλώ ενεργοποιήστε lavc ή fame στο DXR3/H+ κουτί-διαλόγου." +#define MSGTR_NEEDLAVC "Λυπάμαι, δεν μπορείτε να αναπαράγετε αρχεία που δεν είναι mpeg με τη συσκευή DXR3/H+ χωρίς επανακωδικοποίηση.\n Παρακαλώ ενεργοποιήστε lavc στο DXR3/H+ κουτί-διαλόγου." // --- skin loader error messages #define MSGTR_SKIN_ERRORMESSAGE "[skin] σφάλμα στο αρχείο προτιμήσεων του skin στη γραμμή %d: %s" @@ -524,7 +524,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "Προσοχή, μερικές λειτουργίες χρειάζονται επανεκκίνιση αναπαραγωγής." #define MSGTR_PREFERENCES_DXR3_VENC "Κωδικοποιητής βίντεο:" #define MSGTR_PREFERENCES_DXR3_LAVC "Χρήση του LAVC (FFmpeg)" -#define MSGTR_PREFERENCES_DXR3_FAME "Χρήση του FAME" #define MSGTR_PREFERENCES_FontEncoding1 "Unicode" #define MSGTR_PREFERENCES_FontEncoding2 "Δυτικές Ευρωπαϊκές γλώσσες (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Δυτικές Ευρωπαϊκές γλώσσες με Ευρώ (ISO-8859-15)" diff --git a/help/help_mp-en.h b/help/help_mp-en.h index 458ba8f88e..63cd5e98e0 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -723,7 +723,7 @@ static char help_text[]= #define MSGTR_NEMDB "Sorry, not enough memory to draw buffer." #define MSGTR_NEMFMR "Sorry, not enough memory for menu rendering." #define MSGTR_IDFGCVD "Sorry, I did not find a GUI-compatible video output driver." -#define MSGTR_NEEDLAVCFAME "Sorry, you cannot play non-MPEG files with your DXR3/H+ device without reencoding.\nPlease enable lavc or fame in the DXR3/H+ configuration box." +#define MSGTR_NEEDLAVC "Sorry, you cannot play non-MPEG files with your DXR3/H+ device without reencoding.\nPlease enable lavc in the DXR3/H+ configuration box." #define MSGTR_UNKNOWNWINDOWTYPE "Unknown window type found ..." // --- skin loader error messages @@ -887,7 +887,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "Please remember that you need to restart playback for some options to take effect!" #define MSGTR_PREFERENCES_DXR3_VENC "Video encoder:" #define MSGTR_PREFERENCES_DXR3_LAVC "Use LAVC (FFmpeg)" -#define MSGTR_PREFERENCES_DXR3_FAME "Use FAME" #define MSGTR_PREFERENCES_FontEncoding1 "Unicode" #define MSGTR_PREFERENCES_FontEncoding2 "Western European Languages (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Western European Languages with Euro (ISO-8859-15)" @@ -1594,9 +1593,6 @@ static char help_text[]= #define MSGTR_MPCODECS_WarnNextFilterDoesntSupportSlices "WARNING! Next filter doesn't support SLICES, get ready for sig11...\n" #define MSGTR_MPCODECS_FunWhydowegetNULL "Why do we get NULL??\n" -// libmpcodecs/vf_fame.c -#define MSGTR_MPCODECS_FatalCantOpenlibFAME "FATAL: Cannot open libFAME!\n" - // libmpcodecs/vf_test.c, vf_yuy2.c, vf_yvu9.c #define MSGTR_MPCODECS_WarnNextFilterDoesntSupport "%s not supported by next filter/vo :(\n" diff --git a/help/help_mp-es.h b/help/help_mp-es.h index 39ddaef8fc..ae66695d1e 100644 --- a/help/help_mp-es.h +++ b/help/help_mp-es.h @@ -710,7 +710,7 @@ static char help_text[]= #define MSGTR_NEMDB "No hay suficiente memoria para dibujar el búfer." #define MSGTR_NEMFMR "No hay suficiente memoria para dibujar el menú." #define MSGTR_IDFGCVD "No se encuentra driver -vo compatible con la interfaz gráfica." -#define MSGTR_NEEDLAVCFAME "No puede reproducir archivos no MPEG con su DXR3/H+ sin recodificación. Activa lavc o fame en la configuración del DXR3/H+." +#define MSGTR_NEEDLAVC "No puede reproducir archivos no MPEG con su DXR3/H+ sin recodificación. Activa lavc en la configuración del DXR3/H+." #define MSGTR_UNKNOWNWINDOWTYPE "Encontrado tipo de ventana desconocido ..." // --- skin loader error messages @@ -867,7 +867,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "Algunas opciones requieren reiniciar la reproducción." #define MSGTR_PREFERENCES_DXR3_VENC "Codificador de video:" #define MSGTR_PREFERENCES_DXR3_LAVC "Usar LAVC (FFmpeg)" -#define MSGTR_PREFERENCES_DXR3_FAME "Usar FAME" #define MSGTR_PREFERENCES_FontEncoding1 "Unicode" #define MSGTR_PREFERENCES_FontEncoding2 "Occidental (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Occidental con euro (ISO-8859-15)" @@ -1523,8 +1522,6 @@ static char help_text[]= #define MSGTR_MPCODECS_WarnNextFilterDoesntSupportSlices "Advertencia! El próximo filtro no soporta SLICES, preparate para el sig11 (SEGV)...\n" #define MSGTR_MPCODECS_FunWhydowegetNULL "Por qué obtenemos NULL??\n" -// libmpcodecs/vf_fame.c -#define MSGTR_MPCODECS_FatalCantOpenlibFAME "FATAL: No pude abrir libFAME!\n" // libmpcodecs/vf_test.c, vf_yuy2.c, vf_yvu9.c #define MSGTR_MPCODECS_WarnNextFilterDoesntSupport "%s No soportado por el próximo filtro/vo :(\n" diff --git a/help/help_mp-fr.h b/help/help_mp-fr.h index 0c0cca7c27..0bed1a6729 100644 --- a/help/help_mp-fr.h +++ b/help/help_mp-fr.h @@ -701,7 +701,7 @@ static char help_text[]= #define MSGTR_NEMDB "Désolé, pas assez de mémoire pour le tampon de dessin." #define MSGTR_NEMFMR "Désolé, pas assez de mémoire pour le rendu des menus." #define MSGTR_IDFGCVD "Désolé, aucun pilote de sortie vidéo compatible avec la GUI." -#define MSGTR_NEEDLAVCFAME "Désolé, vous ne pouvez pas jouer de fichier non-MPEG avec votre périphérique DXR3/H+ sans réencodage.\nVeuillez activer lavc ou fame dans la boîte de configuration DXR3/H+." +#define MSGTR_NEEDLAVC "Désolé, vous ne pouvez pas jouer de fichier non-MPEG avec votre périphérique DXR3/H+ sans réencodage.\nVeuillez activer lavc dans la boîte de configuration DXR3/H+." #define MSGTR_UNKNOWNWINDOWTYPE "Genre de fenêtre inconnue trouvé ..." // --- messages d'erreurs du chargement de peau --- @@ -857,7 +857,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "ATTENTION: certaines options requièrent un redémarrage de la lecture!" #define MSGTR_PREFERENCES_DXR3_VENC "Encodeur vidéo:" #define MSGTR_PREFERENCES_DXR3_LAVC "Utiliser LAVC (FFmpeg)" -#define MSGTR_PREFERENCES_DXR3_FAME "Utiliser FAME" #define MSGTR_PREFERENCES_FontEncoding1 "Unicode" #define MSGTR_PREFERENCES_FontEncoding2 "Langues Européennes Occidentales (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Langues Européeenes Occidentales avec Euro (ISO-8859-15)" @@ -1522,8 +1521,5 @@ static char help_text[]= #define MSGTR_MPCODECS_WarnNextFilterDoesntSupportSlices "Alerte! Filtre suivant ne supporte pas TRANCHES, gare au sig11...\n" #define MSGTR_MPCODECS_FunWhydowegetNULL "Pourquoi ce NULL??\n" -// libmpcodecs/vf_fame.c -#define MSGTR_MPCODECS_FatalCantOpenlibFAME "FATAL: ne peux ouvrir libFAME!\n" - // libmpcodecs/vf_test.c, vf_yuy2.c, vf_yvu9.c #define MSGTR_MPCODECS_WarnNextFilterDoesntSupport "%s non supporté par filtre suivant/vo :(\n" diff --git a/help/help_mp-hu.h b/help/help_mp-hu.h index d1806e8c5c..f8530febfa 100644 --- a/help/help_mp-hu.h +++ b/help/help_mp-hu.h @@ -718,7 +718,7 @@ static char help_text[]= #define MSGTR_NEMDB "Nincs elég memória a rajzoló bufferhez." #define MSGTR_NEMFMR "Nincs elég memória a menü rendereléséhez." #define MSGTR_IDFGCVD "Nem találtam GUI-kompatibilis videó meghajtót." -#define MSGTR_NEEDLAVCFAME "Nem MPEG fájl lejátszása nem lehetséges a DXR3/H+ hardverrel újrakódolás nélkül.\nKapcsold be a lavc vagy fame opciót a DXR3/H+ konfigurációs panelen." +#define MSGTR_NEEDLAVC "Nem MPEG fájl lejátszása nem lehetséges a DXR3/H+ hardverrel újrakódolás nélkül.\nKapcsold be a lavc opciót a DXR3/H+ konfigurációs panelen." #define MSGTR_UNKNOWNWINDOWTYPE "Ismeretlen ablak típust találtam ..." // --- skin loader error messages @@ -882,7 +882,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "Kérlek emlékezz, néhány opció igényli a lejátszás újraindítását." #define MSGTR_PREFERENCES_DXR3_VENC "Video kódoló:" #define MSGTR_PREFERENCES_DXR3_LAVC "LAVC használata (FFmpeg)" -#define MSGTR_PREFERENCES_DXR3_FAME "FAME használata" #define MSGTR_PREFERENCES_FontEncoding1 "Unicode" #define MSGTR_PREFERENCES_FontEncoding2 "Nyugat-Európai karakterkészlet (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Nyugat-Európai karakterkészlet euróval (ISO-8859-15)" @@ -1566,9 +1565,6 @@ static char help_text[]= #define MSGTR_MPCODECS_WarnNextFilterDoesntSupportSlices "FIGYELEM! A következő szűrő nem támogatja a SLICES-t, készülj a sig11-re...\n" #define MSGTR_MPCODECS_FunWhydowegetNULL "Miért kaptunk itt NULL-t??\n" -// libmpcodecs/vf_fame.c -#define MSGTR_MPCODECS_FatalCantOpenlibFAME "VÉGZETES: A libFAME nem nyitható meg!\n" - // libmpcodecs/vf_test.c, vf_yuy2.c, vf_yvu9.c #define MSGTR_MPCODECS_WarnNextFilterDoesntSupport "%s nem támogatott a következő szűrőben/vo-ban :(\n" diff --git a/help/help_mp-it.h b/help/help_mp-it.h index 86e9f4c280..deb1459454 100644 --- a/help/help_mp-it.h +++ b/help/help_mp-it.h @@ -719,7 +719,7 @@ static char help_text[]= #define MSGTR_NEMDB "Mi dispiace, non c'è sufficiente memoria per tracciare il buffer." #define MSGTR_NEMFMR "Mi dispiace, non c'è sufficiente memoria per visualizzare il menu." #define MSGTR_IDFGCVD "Mi dispiace, non ho trovato un driver di output video compatibile con la GUI." -#define MSGTR_NEEDLAVCFAME "Mi dispiace, non puoi riprodurre file non-MPEG con il tuo dispositivo DXR3/H+\nsenza ricodificarli.\nAbilita lavc o fame nella finestra di configurazione DXR3/H+." +#define MSGTR_NEEDLAVC "Mi dispiace, non puoi riprodurre file non-MPEG con il tuo dispositivo DXR3/H+\nsenza ricodificarli.\nAbilita lavc nella finestra di configurazione DXR3/H+." #define MSGTR_UNKNOWNWINDOWTYPE "Trovato tipo finestra sconosciuto..." // --- skin loader error messages @@ -876,7 +876,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "Ricorda che devi riavviare la riproduzione affinché alcune opzioni abbiano effetto!" #define MSGTR_PREFERENCES_DXR3_VENC "Video encoder:" #define MSGTR_PREFERENCES_DXR3_LAVC "Usa LAVC (FFmpeg)" -#define MSGTR_PREFERENCES_DXR3_FAME "Usa FAME" #define MSGTR_PREFERENCES_FontEncoding1 "Unicode" #define MSGTR_PREFERENCES_FontEncoding2 "Western European Languages (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Western European Languages with Euro (ISO-8859-15)" @@ -1564,9 +1563,6 @@ static char help_text[]= #define MSGTR_MPCODECS_WarnNextFilterDoesntSupportSlices "ATTENZIONE! Il filtro successivo non supporta gli SLICES, aspettati un sig11...\n" #define MSGTR_MPCODECS_FunWhydowegetNULL "Perché abbiamo avuto un NULL??\n" -// libmpcodecs/vf_fame.c -#define MSGTR_MPCODECS_FatalCantOpenlibFAME "FATALE: Impossibile aprire libFAME!\n" - // libmpcodecs/vf_test.c, vf_yuy2.c, vf_yvu9.c #define MSGTR_MPCODECS_WarnNextFilterDoesntSupport "%s non supportato dal filtro/vo successivo :(\n" diff --git a/help/help_mp-ja.h b/help/help_mp-ja.h index 0cd30c40e2..c2659f4440 100644 --- a/help/help_mp-ja.h +++ b/help/help_mp-ja.h @@ -428,7 +428,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_FRAME_Cache "キャッシュ" #define MSGTR_PREFERENCES_DXR3_VENC "Video エンコーダ:" #define MSGTR_PREFERENCES |