[vlc-commits] commit: Allowed a vout_display_t module to do the OSD/subtitles blending. ( Laurent Aimar )

git at videolan.org git at videolan.org
Sun Jan 9 22:44:20 CET 2011


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Dec 12 17:19:36 2010 +0100| [b0fc931f3a6faf28692d8958f28a2c87dc104456] | committer: Laurent Aimar 

Allowed a vout_display_t module to do the OSD/subtitles blending.

You have to set the list of chromas the module support in
vout_display_t::info.subpicture_chromas and then handle the subpicture_t
parameters in vout_display_t::prepare/display.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b0fc931f3a6faf28692d8958f28a2c87dc104456
---

 include/vlc_vout_display.h          |   39 +++++++++++++++++++---------------
 include/vlc_vout_wrapper.h          |   12 +++++++---
 modules/misc/dummy/vout.c           |   10 +++++---
 modules/video_output/aa.c           |   10 +++++---
 modules/video_output/caca.c         |   10 +++++---
 modules/video_output/directfb.c     |    5 ++-
 modules/video_output/egl.c          |    6 +++-
 modules/video_output/fb.c           |    5 ++-
 modules/video_output/ios.m          |   10 +++++---
 modules/video_output/macosx.m       |   10 +++++---
 modules/video_output/msw/direct2d.c |   10 +++++---
 modules/video_output/msw/direct3d.c |   12 +++++++---
 modules/video_output/msw/directx.c  |    5 ++-
 modules/video_output/msw/glwin32.c  |   10 +++++---
 modules/video_output/msw/wingdi.c   |    5 ++-
 modules/video_output/sdl.c          |    5 ++-
 modules/video_output/snapshot.c     |    4 +-
 modules/video_output/vmem.c         |    5 ++-
 modules/video_output/xcb/glx.c      |   10 +++++---
 modules/video_output/xcb/x11.c      |    5 ++-
 modules/video_output/xcb/xvideo.c   |    5 ++-
 modules/video_output/yuv.c          |    5 ++-
 src/video_output/display.c          |   15 +++++++++---
 src/video_output/video_output.c     |    4 +-
 src/video_output/vout_internal.h    |    4 +-
 src/video_output/vout_wrapper.c     |   17 +++++++++-----
 26 files changed, 145 insertions(+), 93 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=b0fc931f3a6faf28692d8958f28a2c87dc104456


More information about the vlc-commits mailing list