4 files changed, 3 insertions, 31 deletions
diff --git a/Gui/cfg.c b/Gui/cfg.c
index bc2a99d5b8..e380de905c 100644
--- a/Gui/cfg.c
+++ b/Gui/cfg.c
@@ -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",&gtkVopLAVC,CONF_TYPE_FLAG,0,0,1,NULL },
 #endif
-#ifdef USE_LIBFAME
- { "vf_fame",&gtkVopFAME,CONF_TYPE_FLAG,0,0,1,NULL },
-#endif
 
  { "ao_driver",&audio_driver_list,CONF_TYPE_STRING_LIST,0,0,0,NULL },
  { "ao_volnorm",&gtkAONorm,CONF_TYPE_FLAG,0,0,1,NULL },
diff --git a/Gui/cfg.h b/Gui/cfg.h
index dd66de193c..afc4b74033 100644
--- a/Gui/cfg.h
+++ b/Gui/cfg.h
@@ -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