diff options
Diffstat (limited to 'src/video_out/video_out_xshm.c')
| -rw-r--r-- | src/video_out/video_out_xshm.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index 6291e44f1..250852521 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.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_xshm.c,v 1.38 2001/09/24 09:09:43 jkeil Exp $ + * $Id: video_out_xshm.c,v 1.39 2001/09/25 18:39:36 jkeil Exp $ * * video_out_xshm.c, X11 shared memory extension interface for xine * @@ -515,17 +515,8 @@ static void xshm_calc_output_size (xshm_driver_t *this) { ideal_height *= this->output_scale_factor; } - /* - * HACK: make sure our special DVD optimized version of - * scale_line is used. - */ - if (this->delivered_width == 720 && ideal_width == 1024 - && this->delivered_height == 576 && ideal_height == 576) { - ideal_width = 1008; - } else { - /* yuv2rgb_mmx prefers "width%8 == 0" */ - ideal_width &= ~7; - } + /* yuv2rgb_mmx prefers "width%8 == 0" */ + ideal_width &= ~7; this->calc_dest_size (ideal_width, ideal_height, &dest_width, &dest_height); @@ -897,7 +888,7 @@ static int xshm_gui_data_exchange (vo_driver_t *this_gen, */ log_scale = log(this->output_scale_factor) / log(1.2); int_scale = rint(log_scale); - if (fabs(log_scale - int_scale) < 0.02) + if (fabs(log_scale - int_scale) < 0.03) this->output_scale_factor = pow(1.2, int_scale); } printf("video_out_xshm: output_scale %f\n", this->output_scale_factor); |