diff options
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_DXR3_LAVC "LAVC (FFmpeg)使用" -#define MSGTR_PREFERENCES_DXR3_FAME "FAME 使用" #define MSGTR_PREFERENCES_FontEncoding1 "ユニコード" #define MSGTR_PREFERENCES_FontEncoding "エンコーディング:" #define MSGTR_PREFERENCES_Cache "キャッシュ on/off" diff --git a/help/help_mp-ko.h b/help/help_mp-ko.h index 8e5208f890..fd48541e4f 100644 --- a/help/help_mp-ko.h +++ b/help/help_mp-ko.h @@ -375,7 +375,6 @@ static char help_text[]= #define MSGTR_NEMDB "죄송합니다. 그리기 버퍼를 위한 충분한 메모리가 없습니다." #define MSGTR_NEMFMR "죄송합니다. 메뉴 렌더링을 위한 충분한 메모리가 없습니다." #define MSGTR_IDFGCVD "죄송합니다. GUI 호환 비디오 출력 드라이버를 찾지 못했습니다." -#define MSGTR_NEEDLAVCFAME "죄송합니다. MPEG가 아닌 파일을 DXR3/H+ 장치로 재생하려면 다시 인코딩해야만 합니다.\nDXR3/H+ 설정 대화상자에서 lavc나 frame이 가능하도록 하세요." // --- skin loader error messages #define MSGTR_SKIN_ERRORMESSAGE "[스킨] 스킨 설정파일의 %d번째 줄에 오류가 있습니다.: %s" @@ -516,7 +515,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 "유니코드" #define MSGTR_PREFERENCES_FontEncoding2 "서유럽어 (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Euro 포함 서유럽어 (ISO-8859-15)" diff --git a/help/help_mp-mk.h b/help/help_mp-mk.h index 343f9e3c83..2b278efe8f 100644 --- a/help/help_mp-mk.h +++ b/help/help_mp-mk.h @@ -372,7 +372,7 @@ static char help_text[]= #define MSGTR_NEMDB "Се извинуваме, немате доволно меморија за графичкиот бафер." #define MSGTR_NEMFMR "Се извинуваме, немате доволно меморија за обојување на менито." #define MSGTR_IDFGCVD "Се извинуваме, не е пронајден компитабилен драјвер на излезното видео за графички интерфејс." -#define MSGTR_NEEDLAVCFAME "Се извинуваме, не можете да пуштате датотеки кои што не се MPEG со вашиот DXR3/H+ уред без реенкодирање.\nВе молиме овозможете lavc или fame во DXR3/H+ кутијата за конфигурирање." +#define MSGTR_NEEDLAVC "Се извинуваме, не можете да пуштате датотеки кои што не се MPEG со вашиот DXR3/H+ уред без реенкодирање.\nВе молиме овозможете lavc во DXR3/H+ кутијата за конфигурирање." // --- пораки со грешка при вчитување на скинови #define MSGTR_SKIN_ERRORMESSAGE "[скин] грешка во конфигурационата датотека за скинови, линија %d: %s" @@ -513,7 +513,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 "Повеќе-коден" #define MSGTR_PREFERENCES_FontEncoding2 "Западно-европски јазици (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Западно-европски јазици со Евро (ISO-8859-15)" diff --git a/help/help_mp-nl.h b/help/help_mp-nl.h index 46157e906c..a8c696813d 100644 --- a/help/help_mp-nl.h +++ b/help/help_mp-nl.h @@ -596,7 +596,7 @@ static char help_text[]= #define MSGTR_NEMDB "Sorry, niet genoeg geheugen voor tekenbuffer." #define MSGTR_NEMFMR "Sorry, niet genoeg geheugen voor menu rendering." #define MSGTR_IDFGCVD "Sorry, kon geen GUI compatibele video uitvoer driver vinden." -#define MSGTR_NEEDLAVCFAME "Sorry, je kan geen niet-MPEG bestanden met je DXR3/H+ apparaat aspelen zonder het bestand te herencoderen.\nActiveer lavc of fame in het DXR3/H+ configuratiescherm." +#define MSGTR_NEEDLAVC "Sorry, je kan geen niet-MPEG bestanden met je DXR3/H+ apparaat aspelen zonder het bestand te herencoderen.\nActiveer lavc in het DXR3/H+ configuratiescherm." // --- skin loader error messages #define MSGTR_SKIN_ERRORMESSAGE "[skin] fout in skin configuratie bestand op regel %d: %s" @@ -743,7 +743,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "Denk eraan, dat sommige functies het afspelen herstarten." #define MSGTR_PREFERENCES_DXR3_VENC "Video encoder:" #define MSGTR_PREFERENCES_DXR3_LAVC "Gebruik LAVC (FFmpeg)" -#define MSGTR_PREFERENCES_DXR3_FAME "Gebruik FAME" #define MSGTR_PREFERENCES_FontEncoding1 "Unicode" #define MSGTR_PREFERENCES_FontEncoding2 "West Europese talen (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "West Europese talen with Euro (ISO-8859-15)" diff --git a/help/help_mp-pl.h b/help/help_mp-pl.h index eacd220623..6d9c85746f 100644 --- a/help/help_mp-pl.h +++ b/help/help_mp-pl.h @@ -713,7 +713,7 @@ static char help_text[]= #define MSGTR_NEMDB "Za mało pamięci by wyrysować bufor." #define MSGTR_NEMFMR "Za mało pamięci na renderowanie menu." #define MSGTR_IDFGCVD "Brak sterownika video zgodnego z GUI." -#define MSGTR_NEEDLAVCFAME "Niestety, nie można odtwarzać plików innych niż MPEG przy użyciu urządzenia DXR3/H+ bez kowersji.\nProszę włączyć lavc lub fame w polu sterowania DXR3/H+." +#define MSGTR_NEEDLAVC "Niestety, nie można odtwarzać plików innych niż MPEG przy użyciu urządzenia DXR3/H+ bez kowersji.\nProszę włączyć lavc w polu sterowania DXR3/H+." #define MSGTR_UNKNOWNWINDOWTYPE "Okno nieznanego typu ..." // --- skin loader error messages @@ -877,7 +877,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "Pamiętaj, że niektóre opcje działają dopiero po zrestartowaniu odtwarzania!" #define MSGTR_PREFERENCES_DXR3_VENC "Koder video:" #define MSGTR_PREFERENCES_DXR3_LAVC "Użyj LAVC (FFmpeg)" -#define MSGTR_PREFERENCES_DXR3_FAME "Użyj FAME" #define MSGTR_PREFERENCES_FontEncoding1 "Unicode" #define MSGTR_PREFERENCES_FontEncoding2 "Języki zachodnioeuropejskie (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Języki zachodnioeuropejskie z Euro (ISO-8859-15)" @@ -1563,9 +1562,6 @@ static char help_text[]= #define MSGTR_MPCODECS_WarnNextFilterDoesntSupportSlices "UWAGA! Następny filtr nie obsługuje SLICES, przygotuj się na sig11...\n" #define MSGTR_MPCODECS_FunWhydowegetNULL "Dlaczego dostaliśmy NULL??\n" -// libmpcodecs/vf_fame.c -#define MSGTR_MPCODECS_FatalCantOpenlibFAME "Błąd krytyczny!: Nie mogę otworzyć libFAME!\n" - // libmpcodecs/vf_test.c, vf_yuy2.c, vf_yvu9.c #define MSGTR_MPCODECS_WarnNextFilterDoesntSupport "%s nie jest obsługiwane przez następny filtr/vo:(\n" diff --git a/help/help_mp-pt_BR.h b/help/help_mp-pt_BR.h index 84b78619fe..e3c223bd77 100644 --- a/help/help_mp-pt_BR.h +++ b/help/help_mp-pt_BR.h @@ -374,7 +374,7 @@ static char help_text[]= #define MSGTR_NEMDB "Desculpe, sem memória suficiente para desenhar o buffer." #define MSGTR_NEMFMR "Desculpe, sem memória suficiente para rendenizar o menu." #define MSGTR_IDFGCVD "Desculpe, eu não encontrei um driver saída de vídeo compatível com GUI." -#define MSGTR_NEEDLAVCFAME "Desculpe, você não pode reproduzir arquivos não-MPEG com o seu dispositivo DXR3/H+ sem recodificar.\nPor favor habilite lavc ou fame na configuração do DXR3/H+." +#define MSGTR_NEEDLAVC "Desculpe, você não pode reproduzir arquivos não-MPEG com o seu dispositivo DXR3/H+ sem recodificar.\nPor favor habilite lavc na configuração do DXR3/H+." // --- skin loader error messages #define MSGTR_SKIN_ERRORMESSAGE "[skin] erro no arquivo de configuração do skin na linha %d: %s" @@ -515,7 +515,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "Por favor lembre que você precisa reiniciar a reprodução para algumas opções fazerem efeito!" #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 "Línguas Européias Ocidentais (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Línguas Européias Ocidentais com Euro (ISO-8859-15)" diff --git a/help/help_mp-ro.h b/help/help_mp-ro.h index 9c205a43c5..36da55c080 100644 --- a/help/help_mp-ro.h +++ b/help/help_mp-ro.h @@ -326,8 +326,8 @@ static char help_text[]= // --- error messages --- #define MSGTR_NEMFMR "Scuze, nu am memorie destulã pentru afiºarea meniului." #define MSGTR_IDFGCVD "Scuze, nu am gãsit un driver video compatibil cu GUI." -#define MSGTR_NEEDLAVCFAME "Scuze, nu poþi afiºa fiºiere ne-MPEG cu dispozitivul DXR3/H+ fãrã recodare.\n"\ -"Activeazã 'lavc' sau 'fame' în cãsuþa de configurare pentru DXR3/H+." +#define MSGTR_NEEDLAVC "Scuze, nu poþi afiºa fiºiere ne-MPEG cu dispozitivul DXR3/H+ fãrã recodare.\n"\ +"Activeazã 'lavc' în cãsuþa de configurare pentru DXR3/H+." // --- skin loader error messages @@ -444,7 +444,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "Nu uita cã rularea trebuie repornitã pentru ca unele opþiuni sã-ºi facã efectul!" #define MSGTR_PREFERENCES_DXR3_VENC "Encoder video:" #define MSGTR_PREFERENCES_DXR3_LAVC "Foloseºte LAVC (FFmpeg)" -#define MSGTR_PREFERENCES_DXR3_FAME "Foloseºte FAME" #define MSGTR_PREFERENCES_FontEncoding1 "Unicode" // lang diff --git a/help/help_mp-ru.h b/help/help_mp-ru.h index b82a8dc83f..63b9236c82 100644 --- a/help/help_mp-ru.h +++ b/help/help_mp-ru.h @@ -718,7 +718,7 @@ static char help_text[]= #define MSGTR_NEMDB "Извините, не хватает памяти для буфера прорисовки." #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+." #define MSGTR_UNKNOWNWINDOWTYPE "Найден неизвестный тип окна..." // --- skin loader error messages @@ -882,7 +882,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "Пожалуйста, запомните, что Вам нужно перезапустить проигрывание,\nчтобы некоторые изменения вступили в силу!" #define MSGTR_PREFERENCES_DXR3_VENC "Видео кодировщик:" #define MSGTR_PREFERENCES_DXR3_LAVC "Использовать LAVC (FFmpeg)" -#define MSGTR_PREFERENCES_DXR3_FAME "Использовать FAME" #define MSGTR_PREFERENCES_FontEncoding1 "Уникод" #define MSGTR_PREFERENCES_FontEncoding2 "Западноевропейские языки (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Западноевропейские языки с Евро (ISO-8859-15)" @@ -1631,9 +1630,6 @@ static char help_text[]= #define MSGTR_MPCODECS_WarnNextFilterDoesntSupportSlices "ПРЕДУПРЕЖДЕНИЕ! Следующий фильтр не поддерживает SLICES,\nприготовьтесь к ошибке сегментации памяти (sig11)...\n" #define MSGTR_MPCODECS_FunWhydowegetNULL "Почемы мы получили NULL??\n" -// libmpcodecs/vf_fame.c -#define MSGTR_MPCODECS_FatalCantOpenlibFAME "ФАТАЛЬНАЯ ОШИБКА: Не могу открыть libFAME!\n" - // libmpcodecs/vf_test.c, vf_yuy2.c, vf_yvu9.c #define MSGTR_MPCODECS_WarnNextFilterDoesntSupport "%s не поддерживается следующим фильтром/видеовыводом :(\n" diff --git a/help/help_mp-sk.h b/help/help_mp-sk.h index 3d52bbe59c..95d0c61168 100644 --- a/help/help_mp-sk.h +++ b/help/help_mp-sk.h @@ -706,7 +706,7 @@ static char help_text[]= #define MSGTR_NEMDB "Žiaľ, nedostatok pamäte pre buffer na kreslenie." #define MSGTR_NEMFMR "Žiaľ, nedostatok pamäte pre vytváranie menu." #define MSGTR_IDFGCVD "Žiaľ, nemôžem nájsť gui kompatibilný ovládač video výstupu." -#define MSGTR_NEEDLAVCFAME "Žiaľ, nemôžete prehrávať nie mpeg súbory s DXR3/H+ zariadením bez prekódovania.\nProsím zapnite lavc alebo fame v DXR3/H+ konfig. okne." +#define MSGTR_NEEDLAVC "Žiaľ, nemôžete prehrávať nie mpeg súbory s DXR3/H+ zariadením bez prekódovania.\nProsím zapnite lavc v DXR3/H+ konfig. okne." #define MSGTR_UNKNOWNWINDOWTYPE "Neznámy typ okna nájdený ..." // --- skin loader error messages @@ -866,7 +866,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "Prosím pamätajte, nietoré voľby potrebujú reštart prehrávania!" #define MSGTR_PREFERENCES_DXR3_VENC "Video kóder:" #define MSGTR_PREFERENCES_DXR3_LAVC "Použiť LAVC (FFmpeg)" -#define MSGTR_PREFERENCES_DXR3_FAME "Použiť 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)" diff --git a/help/help_mp-sv.h b/help/help_mp-sv.h index 9890ee8669..fff96bec09 100644 --- a/help/help_mp-sv.h +++ b/help/help_mp-sv.h @@ -613,7 +613,7 @@ static char help_text[]= #define MSGTR_NEMDB "Tyvärr, inte tillräckligt minne för ritbuffert." #define MSGTR_NEMFMR "Tyvärr, inte tillräckligt minne för menyrendering." #define MSGTR_IDFGCVD "Tyvärr, jag hittade inte en GUI-kompatibel video-ut-drivrutin." -#define MSGTR_NEEDLAVCFAME "Tyvärr, du kan inte spela icke-MPEG-filer med ditt DXR3/H+-enhet utan omkodning.\nVar god aktivera lavc eller fame i 'DXR3/H+'-konfigurationsboxen." +#define MSGTR_NEEDLAVC "Tyvärr, du kan inte spela icke-MPEG-filer med ditt DXR3/H+-enhet utan omkodning.\nVar god aktivera lavc i 'DXR3/H+'-konfigurationsboxen." // --- skin loader error messages #define MSGTR_SKIN_ERRORMESSAGE "[skin] fel i skinkonfigureringsfil på rad %d: %s" @@ -761,7 +761,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "Var god komihåg att du måste starta om uppspelning för att vissa ändringar ska ta effekt!" #define MSGTR_PREFERENCES_DXR3_VENC "Videoencoder:" #define MSGTR_PREFERENCES_DXR3_LAVC "ANvänd LAVC (FFmpeg)" -#define MSGTR_PREFERENCES_DXR3_FAME "Använd FAME" #define MSGTR_PREFERENCES_FontEncoding1 "Unicode" #define MSGTR_PREFERENCES_FontEncoding2 "Västeuropeiska språk (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Västeuropeiska språk med Euro (ISO-8859-15)" diff --git a/help/help_mp-tr.h b/help/help_mp-tr.h index 40d4b623dd..a32dfb9c84 100644 --- a/help/help_mp-tr.h +++ b/help/help_mp-tr.h @@ -714,7 +714,7 @@ static char help_text[]= #define MSGTR_NEMDB "Üzgünüm, tampon için yeterli hafıza yok." #define MSGTR_NEMFMR "Üzgünüm, menü oluşturmak için yeterli hafıza yok." #define MSGTR_IDFGCVD "Üzgünüm, KGA ile uyumlu video çıkış sürücüsü bulunamadı." -#define MSGTR_NEEDLAVCFAME "Üzgünüm, MPEG olmayan dosyaları DXR3/H+ aygıtınızla oynatamazsınız. \nLütfen DXR3/H+ ayarlarından lavc veya fame seçeneğini etkinleştirin." +#define MSGTR_NEEDLAVC "Üzgünüm, MPEG olmayan dosyaları DXR3/H+ aygıtınızla oynatamazsınız. \nLütfen DXR3/H+ ayarlarından lavc seçeneğini etkinleştirin." #define MSGTR_UNKNOWNWINDOWTYPE "Bilinmeyen pencere türü bulundu..." // --- skin loader error messages @@ -874,7 +874,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "Yaptığınız değişiklikleri etkinleştirmek için lütfen Mplayer'ı yeniden başlatmayı unutmayınız." #define MSGTR_PREFERENCES_DXR3_VENC "Video kodlayıcı:" #define MSGTR_PREFERENCES_DXR3_LAVC "LAVC kullan (FFmpeg)" -#define MSGTR_PREFERENCES_DXR3_FAME "FAME kullan" #define MSGTR_PREFERENCES_FontEncoding1 "Unicode" #define MSGTR_PREFERENCES_FontEncoding2 "Batı Avrupa Dilleri (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Batı Avrupa Dilleri ve Euro(ISO-8859-15)" @@ -1558,9 +1557,6 @@ static char help_text[]= #define MSGTR_MPCODECS_WarnNextFilterDoesntSupportSlices "UYARI! Sonraki filtre SLICES desteklemiyor, sig11 için hazırlayınız...\n" #define MSGTR_MPCODECS_FunWhydowegetNULL "Neden NULL ulaşıyoruz??\n" -// libmpcodecs/vf_fame.c -#define MSGTR_MPCODECS_FatalCantOpenlibFAME "HATA: libFAME açılamıyor!\n" - // libmpcodecs/vf_test.c, vf_yuy2.c, vf_yvu9.c #define MSGTR_MPCODECS_WarnNextFilterDoesntSupport "%s sonraki filtre/vo tarafından desteklenmiyor :(\n" diff --git a/help/help_mp-uk.h b/help/help_mp-uk.h index bb36c5ccc8..baacc09b3f 100644 --- a/help/help_mp-uk.h +++ b/help/help_mp-uk.h @@ -360,7 +360,7 @@ static char help_text[]= #define MSGTR_NEMDB "Вибачте, не вистачає пам'яті для відмальовування буферу." #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 "[жупан] помилка у файлі конфігурації жупана, рядок %d : %s" @@ -501,7 +501,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 "Western European Languages (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Western European Languages with Euro (ISO-8859-15)" diff --git a/help/help_mp-zh_CN.h b/help/help_mp-zh_CN.h index 05b2a22e83..c150a73aab 100644 --- a/help/help_mp-zh_CN.h +++ b/help/help_mp-zh_CN.h @@ -711,7 +711,6 @@ static char help_text[]= #define MSGTR_NEMDB "抱歉, 没有足够的内存用于绘制缓冲。" #define MSGTR_NEMFMR "抱歉, 没有足够的内存用于菜单渲染。" #define MSGTR_IDFGCVD "抱歉, 未找到 GUI-兼容的视频输出驱动。" -#define MSGTR_NEEDLAVCFAME "抱歉, 不经过重新编码你不能用 DXR3/H+ 设备播放非 MPEG 文件。\n请在 DXR3/H+ 配置中启用 lavc 或者 fame。" #define MSGTR_UNKNOWNWINDOWTYPE "发现未知窗口类型 ..." // --- skin loader error messages @@ -875,7 +874,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)" @@ -1559,9 +1557,6 @@ static char help_text[]= #define MSGTR_MPCODECS_WarnNextFilterDoesntSupportSlices "警告! 下一个滤镜不支持 SLICES, 等着 sig11...\n" #define MSGTR_MPCODECS_FunWhydowegetNULL "为什么我们得到了 NULL??\n" -// libmpcodecs/vf_fame.c -#define MSGTR_MPCODECS_FatalCantOpenlibFAME "致命错误: 不能打开 libFAME!\n" - // libmpcodecs/vf_test.c, vf_yuy2.c, vf_yvu9.c #define MSGTR_MPCODECS_WarnNextFilterDoesntSupport "下一个滤镜/视频输出不支持 %s :(\n" diff --git a/help/help_mp-zh_TW.h b/help/help_mp-zh_TW.h index 689099dc89..7b42bcd167 100644 --- a/help/help_mp-zh_TW.h +++ b/help/help_mp-zh_TW.h @@ -382,7 +382,6 @@ static char help_text[]= #define MSGTR_NEMDB "很抱歉，繪圖援衝區沒有足夠記憶。" #define MSGTR_NEMFMR "很抱歉，目錄顯示沒有足夠記憶。" #define MSGTR_IDFGCVD "很抱歉，找不到一個 GUI 兼容的視訊輸出驅動程式。" -#define MSGTR_NEEDLAVCFAME "很抱歉，無法用你的 DXR3/H+ 裝置來播放未重新編碼的非 MPEG 檔。\n請使用於 DXR3/H+ 設定格之 lavc 或 fame。" // --- skin loader error messages #define MSGTR_SKIN_ERRORMESSAGE "[skin] 於 skin 設定檔 %d: %s 行出錯" @@ -525,7 +524,6 @@ static char help_text[]= #define MSGTR_PREFERENCES_Message "請記得某些選項要重新播放才會生效﹗" #define MSGTR_PREFERENCES_DXR3_VENC "視訊 encoder:" #define MSGTR_PREFERENCES_DXR3_LAVC "使用 LAVC (FFmpeg)" -#define MSGTR_PREFERENCES_DXR3_FAME "使用 FAME" #define MSGTR_PREFERENCES_FontEncoding1 "統一碼" #define MSGTR_PREFERENCES_FontEncoding2 "西歐語系 (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "西歐語系包含歐羅符號 (ISO-8859-15)" diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index 4fd4e5d0e6..2d71861e82 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -250,10 +250,6 @@ NATIVE_SRCS=native/minilzo.c \ native/RTjpegN.c \ native/xa_gsm.c \ -ifeq ($(FAME),yes) -VFILTER_SRCS += vf_fame.c -endif - ifeq ($(ZORAN),yes) VFILTER_SRCS += vf_zrmjpeg.c endif diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 917ce91223..2286671f67 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -30,7 +30,6 @@ extern vf_info_t vf_info_crop; extern vf_info_t vf_info_expand; extern vf_info_t vf_info_pp; extern vf_info_t vf_info_scale; -extern vf_info_t vf_info_fame; extern vf_info_t vf_info_format; extern vf_info_t vf_info_noformat; extern vf_info_t vf_info_yuy2; @@ -114,9 +113,6 @@ static vf_info_t* filter_list[]={ &vf_info_scale, // &vf_info_osd, &vf_info_vo, -#ifdef USE_LIBFAME - &vf_info_fame, -#endif &vf_info_format, &vf_info_noformat, &vf_info_yuy2, diff --git a/libmpcodecs/vf_fame.c b/libmpcodecs/vf_fame.c deleted file mode 100644 index 9bc60da28d..0000000000 --- a/libmpcodecs/vf_fame.c +++ /dev/null @@ -1,151 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <inttypes.h> - -#include "config.h" -#include "mp_msg.h" -#include "help_mp.h" - -// 100=best >=80 very good >=50 fast -#define QUALITY 90 - -#include "img_format.h" -#include "mp_image.h" -#include "vf.h" - -//#include "libvo/fastmemcpy.h" -#include <fame.h> - -struct vf_priv_s { - unsigned char* outbuf; - int outbuf_size; - fame_parameters_t params; - fame_context_t *ctx; - vo_mpegpes_t pes; -}; - -//===========================================================================// - -static int config(struct vf_instance_s* vf, - int width, int height, int d_width, int d_height, - unsigned int flags, unsigned int outfmt){ - if(vf_next_query_format(vf,IMGFMT_MPEGPES)<=0) return 0; - - vf->priv->params.width=width; - vf->priv->params.height=height; - - vf->priv->outbuf_size=10000+width*height; // must be enough! - if(vf->priv->outbuf) free(vf->priv->outbuf); - vf->priv->outbuf = malloc(vf->priv->outbuf_size); - - fame_init(vf->priv->ctx,&vf->priv->params,vf->priv->outbuf,vf->priv->outbuf_size); - - return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_MPEGPES); -} - -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ - fame_yuv_t yuv; - mp_image_t *dmpi; - int out_size; - - yuv.w=mpi->width; - yuv.h=mpi->height; - yuv.p=mpi->stride[0]; - yuv.y=mpi->planes[0]; - yuv.u=mpi->planes[1]; - yuv.v=mpi->planes[2]; - -// out_size = fame_encode_frame(vf->priv->ctx, &yuv, NULL); - fame_start_frame(vf->priv->ctx, &yuv, NULL); - out_size = fame_encode_slice(vf->priv->ctx); - fame_end_frame(vf->priv->ctx, NULL); - - if(out_size<=0) return 1; - - dmpi=vf_get_image(vf->next,IMGFMT_MPEGPES, - MP_IMGTYPE_EXPORT, 0, - mpi->w, mpi->h); - - vf->priv->pes.data=vf->priv->outbuf; - vf->priv->pes.size=out_size; - vf->priv->pes.id=0x1E0; - vf->priv->pes.timestamp=-1; // dunno - - dmpi->planes[0]=(void*) &vf->priv->pes; - - return vf_next_put_image(vf,dmpi, MP_NOPTS_VALUE); -} - -//===========================================================================// - -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ - switch(fmt){ - case IMGFMT_YV12: - case IMGFMT_I420: - case IMGFMT_IYUV: -// return (vf_next_query_format(vf,IMGFMT_MPEGPES) & (~(VFCAP_CSP_SUPPORTED_BY_HW|VFCAP_ACCEPT_STRIDE))); - return (vf_next_query_format(vf,IMGFMT_MPEGPES) & (~(VFCAP_CSP_SUPPORTED_BY_HW))); - } - return 0; -} - -static int open(vf_instance_t *vf, char* args){ - int p_quality=0; - float p_fps=0; - - vf->config=config; - vf->put_image=put_image; - vf->query_format=query_format; - vf->priv=malloc(sizeof(struct vf_priv_s)); - memset(vf->priv,0,sizeof(struct vf_priv_s)); - - vf->priv->ctx=fame_open(); - if(!vf->priv->ctx){ - mp_msg(MSGT_VFILTER, MSGL_ERR, MSGTR_MPCODECS_FatalCantOpenlibFAME); - return 0; - } - - // TODO: parse args -> - if(args) sscanf(args, "%d:%f", &p_quality, &p_fps); - - if(p_quality<=100){ - // fixed quality - vf->priv->params.quality=p_quality?p_quality:QUALITY; - vf->priv->params.bitrate=0; - } else { - // fixed bitrate (in kbits) - vf->priv->params.quality=QUALITY; - vf->priv->params.bitrate=1000*p_quality; - } - - if(p_fps<1) p_fps=25.0; - if(p_fps == ((int)p_fps)){ - vf->priv->params.frame_rate_num=p_fps; - vf->priv->params.frame_rate_den=1; - } else { - vf->priv->params.frame_rate_num=p_fps*1001; - vf->priv->params.frame_rate_den=1001; - } - - vf->priv->params.coding="I"; - vf->priv->params.slices_per_frame=1; - vf->priv->params.frames_per_sequence=(int)p_fps; - vf->priv->params.shape_quality=100; - vf->priv->params.search_range=8; // for "IPPP" only - vf->priv->params.verbose=0; - vf->priv->params.profile="mpeg1"; // TODO - - return 1; -} - -vf_info_t vf_info_fame = { - "realtime mpeg1 encoding with libFAME", - "fame", - "A'rpi", - "", - open, - NULL -}; - -//===========================================================================// |