summaryrefslogtreecommitdiffstats
path: root/mencoder.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-05-07 13:07:48 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-05-07 13:15:37 +0300
commit267a3f4c9c00848f32c341595d2d831157a79bee (patch)
treecdef15bb746e3a41b1813076f24035fcc8385c30 /mencoder.c
parent5484215d044522bcd30516e458e421f403ca8e35 (diff)
parent96fa9c4e249e9467f21e32191882e511e762fb1f (diff)
downloadmpv-267a3f4c9c00848f32c341595d2d831157a79bee.tar.bz2
mpv-267a3f4c9c00848f32c341595d2d831157a79bee.tar.xz
Merge svn changes up to r26680
Conflicts: Makefile configure osdep/timer-darwin.c
Diffstat (limited to 'mencoder.c')
-rw-r--r--mencoder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mencoder.c b/mencoder.c
index 9cd0655c0f..ed35cfd6d5 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -545,7 +545,7 @@ if (frameno_filename) {
// 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);
+ vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
}
#endif
#ifdef HAVE_FONTCONFIG