Only in MPlayer-1.0pre3: asxparser.o
diff -ru MPlayer-1.0pre3.orig/cfg-common.h MPlayer-1.0pre3/cfg-common.h
--- MPlayer-1.0pre3.orig/cfg-common.h	2003-12-08 22:33:31.000000000 +0100
+++ MPlayer-1.0pre3/cfg-common.h	2004-02-05 03:59:22.279602584 +0100
@@ -237,6 +237,7 @@
 #endif
 #ifdef USE_OSD
 	{"font", &font_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
+	{"fontdesc", &fontdesc_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"ffactor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0, NULL},
  	{"subpos", &sub_pos, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
 	{"subalign", &sub_alignment, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
@@ -252,13 +253,7 @@
  	{"subfont-outline", &subtitle_font_thickness, CONF_TYPE_FLOAT, CONF_RANGE, 0, 8, NULL},
  	{"subfont-autoscale", &subtitle_autoscale, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL},
 #endif
-#ifdef HAVE_FONTCONFIG
-	{"fontconfig", &font_fontconfig, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-	{"nofontconfig", &font_fontconfig, CONF_TYPE_FLAG, 0, 1, 0, NULL},
-#else
-	{"fontconfig", "MPlayer wasn't compiled with Fontconfig support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-	{"nofontconfig", "MPlayer wasn't compiled with Fontconfig support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif
+
 #endif
 
 #else
Only in MPlayer-1.0pre3: cfg-common.h~
Only in MPlayer-1.0pre3: codec-cfg
Only in MPlayer-1.0pre3: codec-cfg.o
Only in MPlayer-1.0pre3: codecs.conf.h
Only in MPlayer-1.0pre3: config.h
Only in MPlayer-1.0pre3: config.mak
Only in MPlayer-1.0pre3: cpudetect.o
Only in MPlayer-1.0pre3: .depend
Only in MPlayer-1.0pre3: divx4_vbr.o
Only in MPlayer-1.0pre3: find_sub.o
Only in MPlayer-1.0pre3: help_mp.h
Only in MPlayer-1.0pre3/input: .depend
Only in MPlayer-1.0pre3/input: input.o
Only in MPlayer-1.0pre3/input: joystick.o
Only in MPlayer-1.0pre3/input: libinput.a
Only in MPlayer-1.0pre3/input: lirc.o
Only in MPlayer-1.0pre3/liba52: bit_allocate.o
Only in MPlayer-1.0pre3/liba52: bitstream.o
Only in MPlayer-1.0pre3/liba52: crc.o
Only in MPlayer-1.0pre3/liba52: .depend
Only in MPlayer-1.0pre3/liba52: downmix.o
Only in MPlayer-1.0pre3/liba52: imdct_mlib.o
Only in MPlayer-1.0pre3/liba52: imdct.o
Only in MPlayer-1.0pre3/liba52: liba52.a
Only in MPlayer-1.0pre3/liba52: parse.o
Only in MPlayer-1.0pre3/liba52: resample.o
Only in MPlayer-1.0pre3/libaf: af_channels.o
Only in MPlayer-1.0pre3/libaf: af_comp.o
Only in MPlayer-1.0pre3/libaf: af_delay.o
Only in MPlayer-1.0pre3/libaf: af_dummy.o
Only in MPlayer-1.0pre3/libaf: af_equalizer.o
Only in MPlayer-1.0pre3/libaf: af_export.o
Only in MPlayer-1.0pre3/libaf: af_format.o
Only in MPlayer-1.0pre3/libaf: af_gate.o
Only in MPlayer-1.0pre3/libaf: af_mp.o
Only in MPlayer-1.0pre3/libaf: af.o
Only in MPlayer-1.0pre3/libaf: af_pan.o
Only in MPlayer-1.0pre3/libaf: af_resample.o
Only in MPlayer-1.0pre3/libaf: af_sub.o
Only in MPlayer-1.0pre3/libaf: af_surround.o
Only in MPlayer-1.0pre3/libaf: af_tools.o
Only in MPlayer-1.0pre3/libaf: af_volume.o
Only in MPlayer-1.0pre3/libaf: .depend
Only in MPlayer-1.0pre3/libaf: filter.o
Only in MPlayer-1.0pre3/libaf: libaf.a
Only in MPlayer-1.0pre3/libaf: window.o
Only in MPlayer-1.0pre3/libao2: afmt.o
Only in MPlayer-1.0pre3/libao2: ao_arts.o
Only in MPlayer-1.0pre3/libao2: ao_esd.o
Only in MPlayer-1.0pre3/libao2: ao_mpegpes.o
Only in MPlayer-1.0pre3/libao2: ao_null.o
Only in MPlayer-1.0pre3/libao2: ao_oss.o
Only in MPlayer-1.0pre3/libao2: ao_pcm.o
Only in MPlayer-1.0pre3/libao2: ao_plugin.o
Only in MPlayer-1.0pre3/libao2: ao_sdl.o
Only in MPlayer-1.0pre3/libao2: audio_out.o
Only in MPlayer-1.0pre3/libao2: config.mak
Only in MPlayer-1.0pre3/libao2: .depend
Only in MPlayer-1.0pre3/libao2: libao2.a
Only in MPlayer-1.0pre3/libao2: pl_delay.o
Only in MPlayer-1.0pre3/libao2: pl_eq.o
Only in MPlayer-1.0pre3/libao2: pl_extrastereo.o
Only in MPlayer-1.0pre3/libao2: pl_format.o
Only in MPlayer-1.0pre3/libao2: pl_resample.o
Only in MPlayer-1.0pre3/libao2: pl_surround.o
Only in MPlayer-1.0pre3/libao2: pl_volnorm.o
Only in MPlayer-1.0pre3/libao2: pl_volume.o
Only in MPlayer-1.0pre3/libao2: remez.o
Only in MPlayer-1.0pre3/libavcodec: 4xm.o
Only in MPlayer-1.0pre3/libavcodec: 8bps.o
Only in MPlayer-1.0pre3/libavcodec: ac3enc.o
Only in MPlayer-1.0pre3/libavcodec: adpcm.o
Only in MPlayer-1.0pre3/libavcodec: adx.o
Only in MPlayer-1.0pre3/libavcodec: allcodecs.o
Only in MPlayer-1.0pre3/libavcodec: asv1.o
Only in MPlayer-1.0pre3/libavcodec: cabac.o
Only in MPlayer-1.0pre3/libavcodec: cinepak.o
Only in MPlayer-1.0pre3/libavcodec: cljr.o
Only in MPlayer-1.0pre3/libavcodec: common.o
Only in MPlayer-1.0pre3/libavcodec: cyuv.o
Only in MPlayer-1.0pre3/libavcodec: .depend
Only in MPlayer-1.0pre3/libavcodec: dpcm.o
Only in MPlayer-1.0pre3/libavcodec: dsputil.o
Only in MPlayer-1.0pre3/libavcodec: dv.o
Only in MPlayer-1.0pre3/libavcodec: error_resilience.o
Only in MPlayer-1.0pre3/libavcodec: eval.o
Only in MPlayer-1.0pre3/libavcodec: faandct.o
Only in MPlayer-1.0pre3/libavcodec: fft.o
Only in MPlayer-1.0pre3/libavcodec: ffv1.o
Only in MPlayer-1.0pre3/libavcodec: flicvideo.o
Only in MPlayer-1.0pre3/libavcodec: golomb.o
Only in MPlayer-1.0pre3/libavcodec: h263dec.o
Only in MPlayer-1.0pre3/libavcodec: h263.o
Only in MPlayer-1.0pre3/libavcodec: h264.o
Only in MPlayer-1.0pre3/libavcodec: huffyuv.o
Only in MPlayer-1.0pre3/libavcodec/i386: cputest.o
Only in MPlayer-1.0pre3/libavcodec/i386: dsputil_mmx.o
Only in MPlayer-1.0pre3/libavcodec/i386: fdct_mmx.o
Only in MPlayer-1.0pre3/libavcodec/i386: fft_sse.o
Only in MPlayer-1.0pre3/libavcodec/i386: idct_mmx.o
Only in MPlayer-1.0pre3/libavcodec/i386: motion_est_mmx.o
Only in MPlayer-1.0pre3/libavcodec/i386: mpegvideo_mmx.o
Only in MPlayer-1.0pre3/libavcodec/i386: simple_idct_mmx.o
Only in MPlayer-1.0pre3/libavcodec: idcinvideo.o
Only in MPlayer-1.0pre3/libavcodec: imgconvert.o
Only in MPlayer-1.0pre3/libavcodec: imgresample.o
Only in MPlayer-1.0pre3/libavcodec: indeo3.o
Only in MPlayer-1.0pre3/libavcodec: interplayvideo.o
Only in MPlayer-1.0pre3/libavcodec: jfdctfst.o
Only in MPlayer-1.0pre3/libavcodec: jfdctint.o
Only in MPlayer-1.0pre3/libavcodec: jrevdct.o
Only in MPlayer-1.0pre3/libavcodec: libavcodec.a
Only in MPlayer-1.0pre3/libavcodec/libpostproc: postprocess.o
Only in MPlayer-1.0pre3/libavcodec: mace.o
Only in MPlayer-1.0pre3/libavcodec: mdct.o
Only in MPlayer-1.0pre3/libavcodec: mem.o
Only in MPlayer-1.0pre3/libavcodec: mjpeg.o
Only in MPlayer-1.0pre3/libavcodec: motion_est.o
Only in MPlayer-1.0pre3/libavcodec: mpeg12.o
Only in MPlayer-1.0pre3/libavcodec: mpegaudiodec.o
Only in MPlayer-1.0pre3/libavcodec: mpegaudio.o
Only in MPlayer-1.0pre3/libavcodec: mpegvideo.o
Only in MPlayer-1.0pre3/libavcodec: msmpeg4.o
Only in MPlayer-1.0pre3/libavcodec: msrle.o
Only in MPlayer-1.0pre3/libavcodec: msvideo1.o
Only in MPlayer-1.0pre3/libavcodec: opts.o
Only in MPlayer-1.0pre3/libavcodec: parser.o
Only in MPlayer-1.0pre3/libavcodec: pcm.o
Only in MPlayer-1.0pre3/libavcodec: ra144.o
Only in MPlayer-1.0pre3/libavcodec: ra288.o
Only in MPlayer-1.0pre3/libavcodec: ratecontrol.o
Only in MPlayer-1.0pre3/libavcodec: rational.o
Only in MPlayer-1.0pre3/libavcodec: raw.o
Only in MPlayer-1.0pre3/libavcodec: resample.o
Only in MPlayer-1.0pre3/libavcodec: roqvideo.o
Only in MPlayer-1.0pre3/libavcodec: rpza.o
Only in MPlayer-1.0pre3/libavcodec: rv10.o
Only in MPlayer-1.0pre3/libavcodec: simple_idct.o
Only in MPlayer-1.0pre3/libavcodec: smc.o
Only in MPlayer-1.0pre3/libavcodec: svq1.o
Only in MPlayer-1.0pre3/libavcodec: truemotion1.o
Only in MPlayer-1.0pre3/libavcodec: utils.o
Only in MPlayer-1.0pre3/libavcodec: vcr1.o
Only in MPlayer-1.0pre3/libavcodec: vp3.o
Only in MPlayer-1.0pre3/libavcodec: vqavideo.o
Only in MPlayer-1.0pre3/libavcodec: wmadec.o
Only in MPlayer-1.0pre3/libavcodec: xan.o
Only in MPlayer-1.0pre3/libdha: .depend
Only in MPlayer-1.0pre3/libdha: libdha.o
Only in MPlayer-1.0pre3/libdha: libdha.so
Only in MPlayer-1.0pre3/libdha: libdha.so.0
Only in MPlayer-1.0pre3/libdha: libdha.so.0.1
Only in MPlayer-1.0pre3/libdha: mtrr.o
Only in MPlayer-1.0pre3/libdha: pci_dev_ids.c
Only in MPlayer-1.0pre3/libdha: pci_ids.h
Only in MPlayer-1.0pre3/libdha: pci_names.c
Only in MPlayer-1.0pre3/libdha: pci_names.h
Only in MPlayer-1.0pre3/libdha: pci_names.o
Only in MPlayer-1.0pre3/libdha: pci.o
Only in MPlayer-1.0pre3/libdha: pci_vendors.h
Only in MPlayer-1.0pre3/libfaad2: bits.o
Only in MPlayer-1.0pre3/libfaad2: cfft.o
Only in MPlayer-1.0pre3/libfaad2: common.o
Only in MPlayer-1.0pre3/libfaad2: decoder.o
Only in MPlayer-1.0pre3/libfaad2: .depend
Only in MPlayer-1.0pre3/libfaad2: dither.o
Only in MPlayer-1.0pre3/libfaad2: drc.o
Only in MPlayer-1.0pre3/libfaad2: error.o
Only in MPlayer-1.0pre3/libfaad2: filtbank.o
Only in MPlayer-1.0pre3/libfaad2: hcr.o
Only in MPlayer-1.0pre3/libfaad2: huffman.o
Only in MPlayer-1.0pre3/libfaad2: ic_predict.o
Only in MPlayer-1.0pre3/libfaad2: is.o
Only in MPlayer-1.0pre3/libfaad2: libfaad2.a
Only in MPlayer-1.0pre3/libfaad2: lt_predict.o
Only in MPlayer-1.0pre3/libfaad2: mdct.o
Only in MPlayer-1.0pre3/libfaad2: mp4.o
Only in MPlayer-1.0pre3/libfaad2: ms.o
Only in MPlayer-1.0pre3/libfaad2: output.o
Only in MPlayer-1.0pre3/libfaad2: pns.o
Only in MPlayer-1.0pre3/libfaad2: pulse.o
Only in MPlayer-1.0pre3/libfaad2: rvlc.o
Only in MPlayer-1.0pre3/libfaad2: sbr_dct.o
Only in MPlayer-1.0pre3/libfaad2: sbr_dec.o
Only in MPlayer-1.0pre3/libfaad2: sbr_e_nf.o
Only in MPlayer-1.0pre3/libfaad2: sbr_fbt.o
Only in MPlayer-1.0pre3/libfaad2: sbr_hfadj.o
Only in MPlayer-1.0pre3/libfaad2: sbr_hfgen.o
Only in MPlayer-1.0pre3/libfaad2: sbr_huff.o
Only in MPlayer-1.0pre3/libfaad2: sbr_qmf.o
Only in MPlayer-1.0pre3/libfaad2: sbr_syntax.o
Only in MPlayer-1.0pre3/libfaad2: sbr_tf_grid.o
Only in MPlayer-1.0pre3/libfaad2: specrec.o
Only in MPlayer-1.0pre3/libfaad2: ssr_fb.o
Only in MPlayer-1.0pre3/libfaad2: ssr_ipqf.o
Only in MPlayer-1.0pre3/libfaad2: ssr.o
Only in MPlayer-1.0pre3/libfaad2: syntax.o
Only in MPlayer-1.0pre3/libfaad2: tns.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_acm.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_alaw.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_dk3adpcm.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_dmo.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_dshow.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_dvdpcm.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_faad.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_ffmpeg.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_flac.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_hwac3.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_imaadpcm.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_liba52.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_libdv.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_libmad.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_libvorbis.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_mp3lib.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_msadpcm.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_msgsm.o
Only in MPlayer-1.0pre3/libmpcodecs: ad.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_pcm.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_qtaudio.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_ra1428.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_realaud.o
Only in MPlayer-1.0pre3/libmpcodecs: ad_roqaudio.o
Only in MPlayer-1.0pre3/libmpcodecs: dec_audio.o
Only in MPlayer-1.0pre3/libmpcodecs: dec_video.o
Only in MPlayer-1.0pre3/libmpcodecs: .depend
Only in MPlayer-1.0pre3/libmpcodecs: img_format.o
Only in MPlayer-1.0pre3/libmpcodecs: libmpcodecs.a
Only in MPlayer-1.0pre3/libmpcodecs: libmpencoders.a
Only in MPlayer-1.0pre3/libmpcodecs/native: cinepak.o
Only in MPlayer-1.0pre3/libmpcodecs/native: decode144.o
Only in MPlayer-1.0pre3/libmpcodecs/native: decode288.o
Only in MPlayer-1.0pre3/libmpcodecs/native: fli.o
Only in MPlayer-1.0pre3/libmpcodecs/native: minilzo.o
Only in MPlayer-1.0pre3/libmpcodecs/native: msvidc.o
Only in MPlayer-1.0pre3/libmpcodecs/native: nuppelvideo.o
Only in MPlayer-1.0pre3/libmpcodecs/native: qtrle.o
Only in MPlayer-1.0pre3/libmpcodecs/native: qtrpza.o
Only in MPlayer-1.0pre3/libmpcodecs/native: qtsmc.o
Only in MPlayer-1.0pre3/libmpcodecs/native: roqav.o
Only in MPlayer-1.0pre3/libmpcodecs/native: RTjpegN.o
Only in MPlayer-1.0pre3/libmpcodecs/native: xa_gsm.o
Only in MPlayer-1.0pre3/libmpcodecs: pullup.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_cinepak.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_cyuv.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_divx4.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_dmo.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_dshow.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_ffmpeg.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_fli.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_hmblck.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_ijpg.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_lcl.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_libdv.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_libmpeg2.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_lzo.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_mpegpes.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_mpng.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_msrle.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_msvidc.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_mtga.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_null.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_nuv.o
Only in MPlayer-1.0pre3/libmpcodecs: vd.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_odivx.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_qt8bps.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_qtrle.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_qtrpza.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_qtsmc.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_qtvideo.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_raw.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_realvid.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_roqvideo.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_sgi.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_theora.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_vfwex.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_vfw.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_xanim.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_xvid4.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_xvid.o
Only in MPlayer-1.0pre3/libmpcodecs: vd_zrmjpeg.o
Only in MPlayer-1.0pre3/libmpcodecs: ve_divx4.o
Only in MPlayer-1.0pre3/libmpcodecs: ve_lavc.o
Only in MPlayer-1.0pre3/libmpcodecs: ve_libdv.o
Only in MPlayer-1.0pre3/libmpcodecs: ve_nuv.o
Only in MPlayer-1.0pre3/libmpcodecs: ve.o
Only in MPlayer-1.0pre3/libmpcodecs: ve_qtvideo.o
Only in MPlayer-1.0pre3/libmpcodecs: ve_rawrgb.o
Only in MPlayer-1.0pre3/libmpcodecs: ve_rawyuv.o
Only in MPlayer-1.0pre3/libmpcodecs: ve_vfw.o
Only in MPlayer-1.0pre3/libmpcodecs: ve_xvid4.o
Only in MPlayer-1.0pre3/libmpcodecs: ve_xvid.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_1bpp.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_2xsai.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_bmovl.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_boxblur.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_cropdetect.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_crop.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_decimate.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_delogo.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_denoise3d.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_detc.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_dint.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_down3dright.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_dsize.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_dvbscale.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_eq2.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_eq.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_expand.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_field.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_filmdint.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_fil.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_flip.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_format.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_framestep.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_halfpack.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_hqdn3d.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_hue.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_il.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_ilpack.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_ivtc.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_lavcdeint.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_lavc.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_mirror.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_noise.o
Only in MPlayer-1.0pre3/libmpcodecs: vf.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_palette.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_perspective.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_pp.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_pullup.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_rectangle.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_rgb2bgr.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_rotate.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_sab.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_scale.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_smartblur.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_softpulldown.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_spp.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_swapuv.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_telecine.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_test.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_tfields.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_tile.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_tinterlace.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_unsharp.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_vo.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_yuvcsp.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_yuy2.o
Only in MPlayer-1.0pre3/libmpcodecs: vf_yvu9.o
Only in MPlayer-1.0pre3/libmpdemux: ai_alsa.o
Only in MPlayer-1.0pre3/libmpdemux: ai_oss.o
Only in MPlayer-1.0pre3/libmpdemux: asfheader.o
Only in MPlayer-1.0pre3/libmpdemux: asf_mmst_streaming.o
Only in MPlayer-1.0pre3/libmpdemux: asf_streaming.o
Only in MPlayer-1.0pre3/libmpdemux: audio_in.o
Only in MPlayer-1.0pre3/libmpdemux: aviheader.o
Only in MPlayer-1.0pre3/libmpdemux: aviprint.o
Only in MPlayer-1.0pre3/libmpdemux: cache2.o
Only in MPlayer-1.0pre3/libmpdemux: cdda.o
Only in MPlayer-1.0pre3/libmpdemux: cddb.o
Only in MPlayer-1.0pre3/libmpdemux: cdinfo.o
Only in MPlayer-1.0pre3/libmpdemux: cookies.o
Only in MPlayer-1.0pre3/libmpdemux: cue_read.o
Only in MPlayer-1.0pre3/libmpdemux: demux_asf.o
Only in MPlayer-1.0pre3/libmpdemux: demux_audio.o
Only in MPlayer-1.0pre3/libmpdemux: demux_avi.o
Only in MPlayer-1.0pre3/libmpdemux: demux_bmp.o
Only in MPlayer-1.0pre3/libmpdemux: demux_demuxers.o
Only in MPlayer-1.0pre3/libmpdemux: demuxer.o
Only in MPlayer-1.0pre3/libmpdemux: demux_film.o
Only in MPlayer-1.0pre3/libmpdemux: demux_fli.o
Only in MPlayer-1.0pre3/libmpdemux: demux_gif.o
Only in MPlayer-1.0pre3/libmpdemux: demux_lmlm4.o
Only in MPlayer-1.0pre3/libmpdemux: demux_mf.o
Only in MPlayer-1.0pre3/libmpdemux: demux_mov.o
Only in MPlayer-1.0pre3/libmpdemux: demux_mpg.o
Only in MPlayer-1.0pre3/libmpdemux: demux_nuv.o
Only in MPlayer-1.0pre3/libmpdemux: demux_ogg.o
Only in MPlayer-1.0pre3/libmpdemux: demux_pva.o
Only in MPlayer-1.0pre3/libmpdemux: demux_rawaudio.o
Only in MPlayer-1.0pre3/libmpdemux: demux_rawdv.o
Only in MPlayer-1.0pre3/libmpdemux: demux_rawvideo.o
Only in MPlayer-1.0pre3/libmpdemux: demux_realaud.o
Only in MPlayer-1.0pre3/libmpdemux: demux_real.o
Only in MPlayer-1.0pre3/libmpdemux: demux_roq.o
Only in MPlayer-1.0pre3/libmpdemux: demux_smjpeg.o
Only in MPlayer-1.0pre3/libmpdemux: demux_ts.o
Only in MPlayer-1.0pre3/libmpdemux: demux_ty.o
Only in MPlayer-1.0pre3/libmpdemux: demux_ty_osd.o
Only in MPlayer-1.0pre3/libmpdemux: demux_viv.o
Only in MPlayer-1.0pre3/libmpdemux: demux_y4m.o
Only in MPlayer-1.0pre3/libmpdemux: .depend
Only in MPlayer-1.0pre3/libmpdemux: dvdnav_stream.o
Only in MPlayer-1.0pre3/libmpdemux: extension.o
Only in MPlayer-1.0pre3/libmpdemux: frequencies.o
Only in MPlayer-1.0pre3/libmpdemux: http.o
Only in MPlayer-1.0pre3/libmpdemux: libmpdemux.a
Only in MPlayer-1.0pre3/libmpdemux: mf.o
Only in MPlayer-1.0pre3/libmpdemux: mp3_hdr.o
Only in MPlayer-1.0pre3/libmpdemux: mpeg_hdr.o
Only in MPlayer-1.0pre3/libmpdemux: muxer_avi.o
Only in MPlayer-1.0pre3/libmpdemux: muxer_mpeg.o
Only in MPlayer-1.0pre3/libmpdemux: muxer.o
Only in MPlayer-1.0pre3/libmpdemux: network.o
Only in MPlayer-1.0pre3/libmpdemux: open.o
Only in MPlayer-1.0pre3/libmpdemux: parse_es.o
Only in MPlayer-1.0pre3/libmpdemux: parse_mp4.o
Only in MPlayer-1.0pre3/libmpdemux: pnm.o
Only in MPlayer-1.0pre3/libmpdemux/realrtsp: asmrp.o
Only in MPlayer-1.0pre3/libmpdemux/realrtsp: real.o
Only in MPlayer-1.0pre3/libmpdemux/realrtsp: rmff.o
Only in MPlayer-1.0pre3/libmpdemux/realrtsp: rtsp.o
Only in MPlayer-1.0pre3/libmpdemux/realrtsp: rtsp_session.o
Only in MPlayer-1.0pre3/libmpdemux/realrtsp: sdpplin.o
Only in MPlayer-1.0pre3/libmpdemux/realrtsp: xbuffer.o
Only in MPlayer-1.0pre3/libmpdemux: rtp.o
Only in MPlayer-1.0pre3/libmpdemux: stream_file.o
Only in MPlayer-1.0pre3/libmpdemux: stream_ftp.o
Only in MPlayer-1.0pre3/libmpdemux: stream_netstream.o
Only in MPlayer-1.0pre3/libmpdemux: stream_null.o
Only in MPlayer-1.0pre3/libmpdemux: stream.o
Only in MPlayer-1.0pre3/libmpdemux: stream_vcd.o
Only in MPlayer-1.0pre3/libmpdemux: tvi_bsdbt848.o
Only in MPlayer-1.0pre3/libmpdemux: tvi_dummy.o
Only in MPlayer-1.0pre3/libmpdemux: tvi_v4l2.o
Only in MPlayer-1.0pre3/libmpdemux: tvi_v4l.o
Only in MPlayer-1.0pre3/libmpdemux: tv.o
Only in MPlayer-1.0pre3/libmpdemux: url.o
Only in MPlayer-1.0pre3/libmpdemux: video.o
Only in MPlayer-1.0pre3/libmpdemux: yuv4mpeg.o
Only in MPlayer-1.0pre3/libmpdemux: yuv4mpeg_ratio.o
Only in MPlayer-1.0pre3/libmpdvdkit2: css.o
Only in MPlayer-1.0pre3/libmpdvdkit2: .depend
Only in MPlayer-1.0pre3/libmpdvdkit2: device.o
Only in MPlayer-1.0pre3/libmpdvdkit2: dvd_input.o
Only in MPlayer-1.0pre3/libmpdvdkit2: dvd_reader.o
Only in MPlayer-1.0pre3/libmpdvdkit2: dvd_udf.o
Only in MPlayer-1.0pre3/libmpdvdkit2: error.o
Only in MPlayer-1.0pre3/libmpdvdkit2: ifo_print.o
Only in MPlayer-1.0pre3/libmpdvdkit2: ifo_read.o
Only in MPlayer-1.0pre3/libmpdvdkit2: ioctl.o
Only in MPlayer-1.0pre3/libmpdvdkit2: libdvdcss.o
Only in MPlayer-1.0pre3/libmpdvdkit2: libmpdvdkit.a
Only in MPlayer-1.0pre3/libmpdvdkit2: nav_print.o
Only in MPlayer-1.0pre3/libmpdvdkit2: nav_read.o
Only in MPlayer-1.0pre3/libmpeg2: alloc.o
Only in MPlayer-1.0pre3/libmpeg2: cpu_accel.o
Only in MPlayer-1.0pre3/libmpeg2: cpu_state.o
Only in MPlayer-1.0pre3/libmpeg2: decode.o
Only in MPlayer-1.0pre3/libmpeg2: .depend
Only in MPlayer-1.0pre3/libmpeg2: header.o
Only in MPlayer-1.0pre3/libmpeg2: idct_alpha.o
Only in MPlayer-1.0pre3/libmpeg2: idct_mlib.o
Only in MPlayer-1.0pre3/libmpeg2: idct_mmx.o
Only in MPlayer-1.0pre3/libmpeg2: idct.o
Only in MPlayer-1.0pre3/libmpeg2: libmpeg2.a
Only in MPlayer-1.0pre3/libmpeg2: motion_comp_alpha.o
Only in MPlayer-1.0pre3/libmpeg2: motion_comp_mlib.o
Only in MPlayer-1.0pre3/libmpeg2: motion_comp_mmx.o
Only in MPlayer-1.0pre3/libmpeg2: motion_comp.o
Only in MPlayer-1.0pre3/libmpeg2: slice.o
Only in MPlayer-1.0pre3/libmpflac: bitbuffer.o
Only in MPlayer-1.0pre3/libmpflac: bitmath.o
Only in MPlayer-1.0pre3/libmpflac: cpu.o
Only in MPlayer-1.0pre3/libmpflac: crc.o
Only in MPlayer-1.0pre3/libmpflac: .depend
Only in MPlayer-1.0pre3/libmpflac: dither.o
Only in MPlayer-1.0pre3/libmpflac: fixed.o
Only in MPlayer-1.0pre3/libmpflac: format.o
Only in MPlayer-1.0pre3/libmpflac: libmpflac.a
Only in MPlayer-1.0pre3/libmpflac: lpc.o
Only in MPlayer-1.0pre3/libmpflac: metadata_object.o
Only in MPlayer-1.0pre3/libmpflac: replaygain_synthesis.o
Only in MPlayer-1.0pre3/libmpflac: stream_decoder.o
Only in MPlayer-1.0pre3/libvo: aclib.o
Only in MPlayer-1.0pre3/libvo: aspect.o
Only in MPlayer-1.0pre3/libvo: config.mak
Only in MPlayer-1.0pre3/libvo: .depend
diff -ru MPlayer-1.0pre3.orig/libvo/font_load_ft.c MPlayer-1.0pre3/libvo/font_load_ft.c
--- MPlayer-1.0pre3.orig/libvo/font_load_ft.c	2003-12-08 14:30:30.000000000 +0100
+++ MPlayer-1.0pre3/libvo/font_load_ft.c	2004-02-05 04:23:29.180640192 +0100
@@ -56,7 +56,6 @@
 int force_load_font;
 
 int using_freetype = 0;
-int font_fontconfig = 0;
 
 //// constants
 static unsigned int const colors = 256;
@@ -1133,30 +1132,32 @@
 
 #ifdef USE_OSD
 #ifdef HAVE_FONTCONFIG
-    if (font_fontconfig)
-    {
-	if (!font_name)
-	    font_name = "sans-serif";
-	FcInit();
-	fc_pattern = FcNameParse(font_name);
+    if (!font_name)
+	font_name = "sans-serif";
+    FcInit();
+    fc_pattern = FcNameParse(font_name);
+    FcConfigSubstitute(0, fc_pattern, FcMatchPattern);
+    FcDefaultSubstitute(fc_pattern);
+    fc_pattern = FcFontMatch(0, fc_pattern, 0);
+    FcPatternGetBool(fc_pattern, FC_SCALABLE, 0, &scalable);
+    if (scalable != FcTrue) {
+	fc_pattern = FcNameParse("sans-serif");
 	FcConfigSubstitute(0, fc_pattern, FcMatchPattern);
 	FcDefaultSubstitute(fc_pattern);
 	fc_pattern = FcFontMatch(0, fc_pattern, 0);
-	FcPatternGetBool(fc_pattern, FC_SCALABLE, 0, &scalable);
-	if (scalable != FcTrue) {
-    	    fc_pattern = FcNameParse("sans-serif");
-    	    FcConfigSubstitute(0, fc_pattern, FcMatchPattern);
-    	    FcDefaultSubstitute(fc_pattern);
-    	    fc_pattern = FcFontMatch(0, fc_pattern, 0);
-	}
-	// s doesn't need to be freed according to fontconfig docs
-	FcPatternGetString(fc_pattern, FC_FILE, 0, &s);
-	vo_font=read_font_desc_ft(s, width, height);
-	free(fc_pattern);
     }
-    else
+    // s doesn't need to be freed according to fontconfig docs
+    FcPatternGetString(fc_pattern, FC_FILE, 0, &s);
+    vo_font=read_font_desc_ft(s, width, height);
+    free(fc_pattern);
 #endif
-    vo_font=read_font_desc_ft(font_name, width, height);
+    if (!vo_font)
+	vo_font=read_font_desc_ft(font_name, width, height);
+    if (!vo_font) /* fallback to .desc font */
+        vo_font=vo_fontdesc;
+    else
+    	if (vo_fontdesc);
+	    free_font_desc(vo_fontdesc); /* we won't need it anymore */
 #endif
 }
 
Only in MPlayer-1.0pre3/libvo: font_load_ft.c~
Only in MPlayer-1.0pre3/libvo: font_load_ft.o
diff -ru MPlayer-1.0pre3.orig/libvo/font_load.h MPlayer-1.0pre3/libvo/font_load.h
--- MPlayer-1.0pre3.orig/libvo/font_load.h	2003-11-20 17:25:40.000000000 +0100
+++ MPlayer-1.0pre3/libvo/font_load.h	2004-02-05 04:16:26.016970848 +0100
@@ -62,6 +62,7 @@
 } font_desc_t;
 
 extern font_desc_t* vo_font;
+extern font_desc_t* vo_fontdesc;
 
 #ifdef HAVE_FREETYPE
 
Only in MPlayer-1.0pre3/libvo: font_load.h~
Only in MPlayer-1.0pre3/libvo: font_load.o
Only in MPlayer-1.0pre3/libvo: geometry.o
Only in MPlayer-1.0pre3/libvo: gtf.o
Only in MPlayer-1.0pre3/libvo: libvo.a
Only in MPlayer-1.0pre3/libvo: osd.o
Only in MPlayer-1.0pre3/libvo: spuenc.o
diff -ru MPlayer-1.0pre3.orig/libvo/sub.c MPlayer-1.0pre3/libvo/sub.c
--- MPlayer-1.0pre3.orig/libvo/sub.c	2003-10-27 22:36:29.000000000 +0100
+++ MPlayer-1.0pre3/libvo/sub.c	2004-02-05 04:16:58.366053040 +0100
@@ -55,6 +55,7 @@
 
 //static int vo_font_loaded=-1;
 font_desc_t* vo_font=NULL;
+font_desc_t* vo_fontdesc=NULL;
 
 unsigned char* vo_osd_text=NULL;
 int sub_unicode=0;
Only in MPlayer-1.0pre3/libvo: sub.c~
Only in MPlayer-1.0pre3/libvo: sub.o
Only in MPlayer-1.0pre3/libvo: vesa_lvo.o
Only in MPlayer-1.0pre3/libvo: video_out.o
Only in MPlayer-1.0pre3/libvo: vo_cvidix.o
Only in MPlayer-1.0pre3/libvo: vo_dga.o
Only in MPlayer-1.0pre3/libvo: vo_fbdev2.o
Only in MPlayer-1.0pre3/libvo: vo_fbdev.o
Only in MPlayer-1.0pre3/libvo: vo_gif89a.o
Only in MPlayer-1.0pre3/libvo: vo_gl2.o
Only in MPlayer-1.0pre3/libvo: vo_gl.o
Only in MPlayer-1.0pre3/libvo: vo_jpeg.o
Only in MPlayer-1.0pre3/libvo: vo_md5.o
Only in MPlayer-1.0pre3/libvo: vo_mpegpes.o
Only in MPlayer-1.0pre3/libvo: vo_null.o
Only in MPlayer-1.0pre3/libvo: vo_pgm.o
Only in MPlayer-1.0pre3/libvo: vo_png.o
Only in MPlayer-1.0pre3/libvo: vo_sdl.o
Only in MPlayer-1.0pre3/libvo: vosub_vidix.o
Only in MPlayer-1.0pre3/libvo: vo_tga.o
Only in MPlayer-1.0pre3/libvo: vo_vesa.o
Only in MPlayer-1.0pre3/libvo: vo_x11.o
Only in MPlayer-1.0pre3/libvo: vo_xover.o
Only in MPlayer-1.0pre3/libvo: vo_xvidix.o
Only in MPlayer-1.0pre3/libvo: vo_xv.o
Only in MPlayer-1.0pre3/libvo: vo_yuv4mpeg.o
Only in MPlayer-1.0pre3/libvo: x11_common.o
Only in MPlayer-1.0pre3/loader: afl.o
Only in MPlayer-1.0pre3/loader/dmo: buffer.o
Only in MPlayer-1.0pre3/loader/dmo: .depend
Only in MPlayer-1.0pre3/loader/dmo: DMO_AudioDecoder.o
Only in MPlayer-1.0pre3/loader/dmo: dmo_guids.o
Only in MPlayer-1.0pre3/loader/dmo: dmo.o
Only in MPlayer-1.0pre3/loader/dmo: DMO_VideoDecoder.o
Only in MPlayer-1.0pre3/loader/dmo: libDMO_Filter.a
Only in MPlayer-1.0pre3/loader: driver.o
Only in MPlayer-1.0pre3/loader/dshow: allocator.o
Only in MPlayer-1.0pre3/loader/dshow: cmediasample.o
Only in MPlayer-1.0pre3/loader/dshow: .depend
Only in MPlayer-1.0pre3/loader/dshow: DS_AudioDecoder.o
Only in MPlayer-1.0pre3/loader/dshow: DS_Filter.o
Only in MPlayer-1.0pre3/loader/dshow: DS_VideoDecoder.o
Only in MPlayer-1.0pre3/loader/dshow: guids.o
Only in MPlayer-1.0pre3/loader/dshow: inputpin.o
Only in MPlayer-1.0pre3/loader/dshow: libDS_Filter.a
Only in MPlayer-1.0pre3/loader/dshow: outputpin.o
Only in MPlayer-1.0pre3/loader: elfdll.o
Only in MPlayer-1.0pre3/loader: ext.o
Only in MPlayer-1.0pre3/loader: ldt_keeper.o
Only in MPlayer-1.0pre3/loader: libloader.a
Only in MPlayer-1.0pre3/loader: module.o
Only in MPlayer-1.0pre3/loader: pe_image.o
Only in MPlayer-1.0pre3/loader: pe_resource.o
Only in MPlayer-1.0pre3/loader: registry.o
Only in MPlayer-1.0pre3/loader: resource.o
Only in MPlayer-1.0pre3/loader: stubs.o
Only in MPlayer-1.0pre3/loader: vfl.o
Only in MPlayer-1.0pre3/loader: win32.o
Only in MPlayer-1.0pre3/loader: wrapper.o
Only in MPlayer-1.0pre3: m_config.o
Only in MPlayer-1.0pre3: mencoder
diff -ru MPlayer-1.0pre3.orig/mencoder.c MPlayer-1.0pre3/mencoder.c
--- MPlayer-1.0pre3.orig/mencoder.c	2003-12-08 22:33:31.000000000 +0100
+++ MPlayer-1.0pre3/mencoder.c	2004-02-05 04:20:08.248186568 +0100
@@ -172,6 +172,7 @@
 
 // sub:
 char *font_name=NULL;
+char *fontdesc_name=NULL;
 #ifdef HAVE_FONTCONFIG
 extern int font_fontconfig;
 #endif
@@ -444,22 +445,16 @@
 #ifdef HAVE_FREETYPE
   init_freetype();
 #endif
-#ifdef HAVE_FONTCONFIG
-  if(!font_fontconfig)
-  {
-#endif
-  if(font_name){
-       vo_font=read_font_desc(font_name,font_factor,verbose>1);
-       if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
-  } else {
-      // try default:
-       vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
-       if(!vo_font)
-       vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
-  }
-#ifdef HAVE_FONTCONFIG
-  }
-#endif
+    if (fontdesc_name) {
+	if ((vo_fontdesc=read_font_desc(fontdesc_name,font_factor,verbose>1)))
+	    goto fontdesc_read; 
+	    // try default:
+	    if ((vo_fontdesc=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1)))
+		goto fontdesc_read;
+	    vo_fontdesc=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
+    }
+fontdesc_read:
+    vo_font=vo_fontdesc; /* need to set this, we might not have freetype at all */
 #endif
 
   vo_init_osd();
Only in MPlayer-1.0pre3: mencoder.c~
Only in MPlayer-1.0pre3: mencoder.o
Only in MPlayer-1.0pre3: mixer.o
Only in MPlayer-1.0pre3: m_option.o
Only in MPlayer-1.0pre3/mp3lib: dct36_3dnow.o
Only in MPlayer-1.0pre3/mp3lib: dct36_k7.o
Only in MPlayer-1.0pre3/mp3lib: dct64_3dnow.o
Only in MPlayer-1.0pre3/mp3lib: dct64_k7.o
Only in MPlayer-1.0pre3/mp3lib: dct64_MMX.o
Only in MPlayer-1.0pre3/mp3lib: decode_i586.o
Only in MPlayer-1.0pre3/mp3lib: decode_MMX.o
Only in MPlayer-1.0pre3/mp3lib: .depend
Only in MPlayer-1.0pre3/mp3lib: libMP3.a
Only in MPlayer-1.0pre3/mp3lib: sr1.o
Only in MPlayer-1.0pre3/mp3lib: tabinit_MMX.o
Only in MPlayer-1.0pre3: mplayer
diff -ru MPlayer-1.0pre3.orig/mplayer.c MPlayer-1.0pre3/mplayer.c
--- MPlayer-1.0pre3.orig/mplayer.c	2003-12-08 22:33:31.000000000 +0100
+++ MPlayer-1.0pre3/mplayer.c	2004-02-05 04:20:09.872939568 +0100
@@ -284,9 +284,7 @@
 
 // sub:
 char *font_name=NULL;
-#ifdef HAVE_FONTCONFIG
-extern int font_fontconfig;
-#endif
+char *fontdesc_name=NULL;
 float font_factor=0.75;
 char **sub_name=NULL;
 float sub_delay=0;
@@ -1062,23 +1060,18 @@
 #ifdef HAVE_FREETYPE
   init_freetype();
 #endif
-#ifdef HAVE_FONTCONFIG
-  if(!font_fontconfig)
-  {
-#endif
-  if(font_name){
-       vo_font=read_font_desc(font_name,font_factor,verbose>1);
-       if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
-  } else {
-      // try default:
-       vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
-       if(!vo_font)
-       vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
-  }
-#ifdef HAVE_FONTCONFIG
-  }
-#endif
+    if (fontdesc_name) {
+	if ((vo_fontdesc=read_font_desc(fontdesc_name,font_factor,verbose>1)))
+	    goto fontdesc_read; 
+	    // try default:
+	    if ((vo_fontdesc=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1)))
+		goto fontdesc_read;
+	    vo_fontdesc=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
+    }
+fontdesc_read:
+    vo_font=vo_fontdesc; /* need to set this, we might not have freetype at all */
 #endif
+
   vo_init_osd();
 
 #ifdef HAVE_RTC
Only in MPlayer-1.0pre3: mplayer.c~
diff -ru MPlayer-1.0pre3.orig/mplayer.h MPlayer-1.0pre3/mplayer.h
--- MPlayer-1.0pre3.orig/mplayer.h	2003-04-07 18:03:37.000000000 +0200
+++ MPlayer-1.0pre3/mplayer.h	2004-02-05 04:17:54.448527208 +0100
@@ -23,6 +23,7 @@
 extern int osd_visible;
 
 extern char * font_name;
+extern char * fontdesc_name;
 extern float  font_factor;
 extern float movie_aspect;
 extern float force_fps;
Only in MPlayer-1.0pre3: mplayer.h~
Only in MPlayer-1.0pre3: mplayer.o
Only in MPlayer-1.0pre3: mp_msg-mencoder.o
Only in MPlayer-1.0pre3: mp_msg.o
Only in MPlayer-1.0pre3: m_struct.o
Only in MPlayer-1.0pre3/osdep: .depend
Only in MPlayer-1.0pre3/osdep: getch2.o
Only in MPlayer-1.0pre3/osdep: gettimeofday.o
Only in MPlayer-1.0pre3/osdep: libosdep.a
Only in MPlayer-1.0pre3/osdep: lrmi.o
Only in MPlayer-1.0pre3/osdep: scandir.o
Only in MPlayer-1.0pre3/osdep: shmem.o
Only in MPlayer-1.0pre3/osdep: strsep.o
Only in MPlayer-1.0pre3/osdep: timer-lx.o
Only in MPlayer-1.0pre3/osdep: vbelib.o
Only in MPlayer-1.0pre3/osdep: vsscanf.o
Only in MPlayer-1.0pre3: parser-cfg.o
Only in MPlayer-1.0pre3: parser-mecmd.o
Only in MPlayer-1.0pre3: parser-mpcmd.o
Only in MPlayer-1.0pre3: playtree.o
Only in MPlayer-1.0pre3: playtreeparser.o
Only in MPlayer-1.0pre3/postproc: .depend
Only in MPlayer-1.0pre3/postproc: libswscale.a
Only in MPlayer-1.0pre3/postproc: rgb2rgb.o
Only in MPlayer-1.0pre3/postproc: swscale.o
Only in MPlayer-1.0pre3/postproc: yuv2rgb.o
Only in MPlayer-1.0pre3: spudec.o
Only in MPlayer-1.0pre3: sub_cc.o
Only in MPlayer-1.0pre3: subreader.o
Only in MPlayer-1.0pre3: unrarlib.o
Only in MPlayer-1.0pre3: version.h
Only in MPlayer-1.0pre3/vidix: .depend
Only in MPlayer-1.0pre3/vidix/drivers: cyberblade_vid.o
Only in MPlayer-1.0pre3/vidix/drivers: cyberblade_vid.so
Only in MPlayer-1.0pre3/vidix/drivers: mach64_vid.o
Only in MPlayer-1.0pre3/vidix/drivers: mach64_vid.so
Only in MPlayer-1.0pre3/vidix/drivers: mga_crtc2_vid.o
Only in MPlayer-1.0pre3/vidix/drivers: mga_crtc2_vid.so
Only in MPlayer-1.0pre3/vidix/drivers: mga_vid.o
Only in MPlayer-1.0pre3/vidix/drivers: mga_vid.so
Only in MPlayer-1.0pre3/vidix/drivers: nvidia_vid.o
Only in MPlayer-1.0pre3/vidix/drivers: nvidia_vid.so
Only in MPlayer-1.0pre3/vidix/drivers: pm3_vid.o
Only in MPlayer-1.0pre3/vidix/drivers: pm3_vid.so
Only in MPlayer-1.0pre3/vidix/drivers: radeon_vid.o
Only in MPlayer-1.0pre3/vidix/drivers: radeon_vid.so
Only in MPlayer-1.0pre3/vidix/drivers: rage128_vid.o
Only in MPlayer-1.0pre3/vidix/drivers: rage128_vid.so
Only in MPlayer-1.0pre3/vidix/drivers: sis_bridge.o
Only in MPlayer-1.0pre3/vidix/drivers: sis_vid.o
Only in MPlayer-1.0pre3/vidix/drivers: sis_vid.so
Only in MPlayer-1.0pre3/vidix: libvidix.a
Only in MPlayer-1.0pre3/vidix: vidixlib.o
Only in MPlayer-1.0pre3: vobsub.o
Only in MPlayer-1.0pre3: xvid_vbr.o