diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-07-18 09:30:34 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-07-18 09:30:34 +0000 |
| commit | 295b04ec0ecec2e3e95817e4161c9e29313e2452 (patch) | |
| tree | 6b25848dc0a2c4ac6a160af9bb403196be93fe35 | |
| parent | 7d8fa869a3a0698424c7d325dff69f446ea63308 (diff) | |
| download | xine-lib-295b04ec0ecec2e3e95817e4161c9e29313e2452.tar.gz xine-lib-295b04ec0ecec2e3e95817e4161c9e29313e2452.tar.bz2 | |
don't use pan&scan mode when overlay is active
CVS patchset: 2309
CVS date: 2002/07/18 09:30:34
| -rw-r--r-- | src/dxr3/video_out_dxr3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index aa0affd90..56f1f8751 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_dxr3.c,v 1.43 2002/07/17 16:56:36 mroi Exp $ + * $Id: video_out_dxr3.c,v 1.44 2002/07/18 09:30:34 mroi Exp $ */ /* mpeg1 encoding video out plugin for the dxr3. @@ -629,11 +629,11 @@ static void dxr3_display_frame(vo_driver_t *this_gen, vo_frame_t *frame_gen) } if (frame->aspect != this->aspect) dxr3_set_property(this_gen, VO_PROP_ASPECT_RATIO, frame->vo_frame.ratio); - if (frame->pan_scan && !this->pan_scan) { + if (frame->pan_scan && !this->pan_scan && !this->overlay_enabled) { dxr3_set_property(this_gen, VO_PROP_ZOOM_FACTOR, 1); this->pan_scan = 1; } - if (!frame->pan_scan && this->pan_scan) { + if (!frame->pan_scan && this->pan_scan && !this->overlay_enabled) { this->pan_scan = 0; dxr3_set_property(this_gen, VO_PROP_ZOOM_FACTOR, -1); } |