summaryrefslogtreecommitdiffstats
path: root/libvo/vo_mpegpes.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-15 14:42:15 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-15 14:42:15 +0000
commitb2b1105129d8a915357d8132df1abcb256926bad (patch)
tree3f8c9224f6b0428bfd2152bcc601b0e015a1da2f /libvo/vo_mpegpes.c
parentfee8789cea9482dd0b97c55779abc52e1b045a8d (diff)
downloadmpv-b2b1105129d8a915357d8132df1abcb256926bad.tar.bz2
mpv-b2b1105129d8a915357d8132df1abcb256926bad.tar.xz
place subtitles under the image
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5081 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_mpegpes.c')
-rw-r--r--libvo/vo_mpegpes.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/libvo/vo_mpegpes.c b/libvo/vo_mpegpes.c
index 9449346d93..adca4d101d 100644
--- a/libvo/vo_mpegpes.c
+++ b/libvo/vo_mpegpes.c
@@ -5,7 +5,7 @@
#define QUALITY 90
// #undef if you don't want mpeg1 transcoder (you'll be limited to mpeg1/2 playback only)
-//#define USE_LIBFAME
+#define USE_LIBFAME
/*
* Based on:
@@ -203,12 +203,15 @@ if(format==IMGFMT_YV12){
osd_w=params.width;
} else s_pos_x=0;
- osd_h=s_height;
d_pos_y=(params.height-(int)s_height)/2;
if(d_pos_y<0){
s_pos_y=-d_pos_y;d_pos_y=0;
osd_h=params.height;
- } else s_pos_y=0;
+ } else {
+ s_pos_y=0;
+ osd_h=s_height+d_pos_y;
+ // if(d_pos_y) osd clear: s_height+d_pos_y .. params.height
+ }
printf("[vo] position mapping: %d;%d => %d;%d\n",s_pos_x,s_pos_y,d_pos_x,d_pos_y);
@@ -254,6 +257,10 @@ static void draw_osd(void)
{
#ifdef USE_LIBFAME
if(picture_buf){ // YV12 only:
+ // if(d_pos_y) osd clear: s_height+d_pos_y .. params.height
+ if(d_pos_y){
+ memset(yuv.y+osd_h*yuv.w,0,(params.height-osd_h)*yuv.w);
+ }
vo_draw_text(osd_w,osd_h,draw_alpha);
}
#endif