summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-06-05 19:35:54 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-06-05 19:35:54 +0000
commitae8906e42cbf6de281e5c90fb05704234f777d67 (patch)
treef09eecbaec15cde716c93c02877c4bb3a4e7bdeb /mplayer.c
parent49d13970550898741af54c3f70f88fc890db3fb2 (diff)
downloadmpv-ae8906e42cbf6de281e5c90fb05704234f777d67.tar.bz2
mpv-ae8906e42cbf6de281e5c90fb05704234f777d67.tar.xz
added panscan support for xmga/xvidix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6308 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c30
1 files changed, 16 insertions, 14 deletions
diff --git a/mplayer.c b/mplayer.c
index 226c42beac..e27a9d5112 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2545,22 +2545,24 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
if(video_out && vo_config_count) video_out->control(VOCTRL_FULLSCREEN, 0);
} break;
case MP_CMD_PANSCAN : {
- int abs= cmd->args[1].v.i;
- float v = cmd->args[0].v.f;
- float res;
- if(abs)
- res = v;
- else
- res = vo_panscan+v;
- vo_panscan = res > 1 ? 1 : res < 0 ? 0 : res;
+ if ( video_out->control( VOCTRL_GET_PANSCAN,NULL ) == VO_TRUE )
+ {
+ int abs= cmd->args[1].v.i;
+ float v = cmd->args[0].v.f;
+ float res;
+ if(abs) res = v;
+ else res = vo_panscan+v;
+ vo_panscan = res > 1 ? 1 : res < 0 ? 0 : res;
+ video_out->control( VOCTRL_SET_PANSCAN,NULL );
#ifdef USE_OSD
- if(osd_level){
- osd_visible=sh_video->fps; // 1 sec
- vo_osd_progbar_type=OSD_PANSCAN;
- vo_osd_progbar_value=vo_panscan*256;
- vo_osd_changed(OSDTYPE_PROGBAR);
- }
+ if(osd_level){
+ osd_visible=sh_video->fps; // 1 sec
+ vo_osd_progbar_type=OSD_PANSCAN;
+ vo_osd_progbar_value=vo_panscan*256;
+ vo_osd_changed(OSDTYPE_PROGBAR);
+ }
#endif
+ }
} break;
case MP_CMD_SUB_POS:
{