Mercurial > mplayer.hg
diff gui/interface.c @ 32117:7af5fdfdc3d9
Remove libavcodec ifdeffery from the GUI code.
The GUI depends on libavcodec, so the #ifdefs are unneeded.
| author | diego |
|---|---|
| date | Sun, 12 Sep 2010 15:38:21 +0000 |
| parents | fb341240a2a8 |
| children | ef21cbba62ee |
line wrap: on
line diff
--- a/gui/interface.c Sun Sep 12 15:35:41 2010 +0000 +++ b/gui/interface.c Sun Sep 12 15:38:21 2010 +0000 @@ -659,11 +659,7 @@ } // -- subtitle #ifdef CONFIG_DXR3 - if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) && guiIntfStruct.FileFormat != DEMUXER_TYPE_MPEG_PS -#ifdef CONFIG_LIBAVCODEC - && !gtkVfLAVC -#endif - ) + if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) && guiIntfStruct.FileFormat != DEMUXER_TYPE_MPEG_PS && !gtkVfLAVC ) { gtkMessageBox( GTK_MB_FATAL,MSGTR_NEEDLAVC ); guiIntfStruct.Playing=0; @@ -748,16 +744,12 @@ } #ifdef CONFIG_DXR3 -#ifdef CONFIG_LIBAVCODEC remove_vf( "lavc" ); -#endif if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) ) { if ( ( guiIntfStruct.StreamType != STREAMTYPE_DVD)&&( guiIntfStruct.StreamType != STREAMTYPE_VCD ) ) { -#ifdef CONFIG_LIBAVCODEC if ( gtkVfLAVC ) add_vf( "lavc" ); -#endif } } #endif