diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
commit | 8c144171bb80dd3d1f7161b97675e78cad00bc65 (patch) | |
tree | 7ad930ebc554ab68af1911f4dfd217cc18b86cce /libvo/vo_aa.c | |
parent | 52ee93c1c64dfaa0afc881c38154b04c100cb617 (diff) | |
parent | 8c5889004f7ba9f6fcbca20a05a9301771348408 (diff) | |
download | mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.bz2 mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.xz |
Merge svn changes up to r28087
Conflicts:
command.c
libao2/ao_ivtv.c
libao2/ao_v4l2.c
libmpcodecs/dec_video.h
libvo/aspect.h
libvo/sub.c
libvo/sub.h
libvo/vo_directx.c
libvo/vo_macosx.m
libvo/vo_quartz.c
mp_core.h
mplayer.c
mplayer.h
osdep/getch2.h
osdep/timer.h
Diffstat (limited to 'libvo/vo_aa.c')
-rw-r--r-- | libvo/vo_aa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c index 3b3d5f8f50..1be77fd93e 100644 --- a/libvo/vo_aa.c +++ b/libvo/vo_aa.c @@ -234,7 +234,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, /* nothing will change its size, be we need some values initialized */ resize(); - /* now init out own 'font' (to use vo_draw_text_sub without edit them) */ + /* now init our own 'font' */ if(!vo_font_save) vo_font_save = vo_font; if(vo_font == vo_font_save) { vo_font=malloc(sizeof(font_desc_t));//if(!desc) return NULL; |