diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-17 02:18:10 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-17 05:04:32 +0300 |
| commit | 68e70b3ec34af2e1002d17d0dc81b3408a399ade (patch) | |
| tree | b6b00fd57b24e713e0dc180b64d266b958df7daa /libvo/vosub_vidix.c | |
| parent | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (diff) | |
| parent | dcd0902bcdb1a62f4246cbfba48bd1b77841ceda (diff) | |
| download | mpv-68e70b3ec34af2e1002d17d0dc81b3408a399ade.tar.bz2 mpv-68e70b3ec34af2e1002d17d0dc81b3408a399ade.tar.xz | |
Merge svn changes up to r27092
Conflicts:
libmpdemux/demuxer.c
libvo/vo_xv.c
mencoder.c
Diffstat (limited to 'libvo/vosub_vidix.c')
| -rw-r--r-- | libvo/vosub_vidix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index a2146139e5..ac2f41aefe 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -646,8 +646,8 @@ int vidix_preinit(const char *drvname, struct vo_old_functions *server) mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_CouldntGetCapability,strerror(err)); return -1; } - mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SUB_VIDIX_Description, vidix_cap.name); - mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SUB_VIDIX_Author, vidix_cap.author); + mp_msg(MSGT_VO,MSGL_V, "[VO_SUB_VIDIX] Description: %s.\n", vidix_cap.name); + mp_msg(MSGT_VO,MSGL_V, "[VO_SUB_VIDIX] Author: %s.\n", vidix_cap.author); /* we are able to tune up this stuff depend on fourcc format */ server->draw_slice=vidix_draw_slice; server->draw_frame=vidix_draw_frame; |