diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-08-12 13:54:21 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-08-12 13:54:21 +0000 |
| commit | f8fb6933244e2e494052c840bdd7dd9d66ed8512 (patch) | |
| tree | bf4034ff0f229b17ad0883f486a7c59510c787fe | |
| parent | b09c95b2af9688e76963d351ebe8a06c8c2f119a (diff) | |
| download | xine-lib-f8fb6933244e2e494052c840bdd7dd9d66ed8512.tar.gz xine-lib-f8fb6933244e2e494052c840bdd7dd9d66ed8512.tar.bz2 | |
these tests are done more cenralized in video out now
CVS patchset: 5276
CVS date: 2003/08/12 13:54:21
| -rw-r--r-- | src/dxr3/video_out_dxr3.c | 6 | ||||
| -rw-r--r-- | src/xine-engine/vo_scale.c | 9 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index 851e0e779..ae8446475 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.84 2003/08/05 15:07:42 mroi Exp $ + * $Id: video_out_dxr3.c,v 1.85 2003/08/12 13:54:21 mroi Exp $ */ /* mpeg1 encoding video out plugin for the dxr3. @@ -585,10 +585,6 @@ static void dxr3_update_frame_format(vo_driver_t *this_gen, vo_frame_t *frame_ge /* don't add black bars; assume source is in 4:3 */ ratio = 4.0/3.0; - if (ratio <= 0.0) - /* correct some crazy aspects */ - ratio = (double)width / (double)height; - frame->vo_frame.ratio = ratio; frame->pan_scan = 0; frame->aspect = this->aspect; diff --git a/src/xine-engine/vo_scale.c b/src/xine-engine/vo_scale.c index d113439eb..ba1a0d0a1 100644 --- a/src/xine-engine/vo_scale.c +++ b/src/xine-engine/vo_scale.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: vo_scale.c,v 1.22 2003/08/04 03:47:11 miguelfreitas Exp $ + * $Id: vo_scale.c,v 1.23 2003/08/12 13:54:21 mroi Exp $ * * Contains common code to calculate video scaling parameters. * In short, it will map frame dimensions to screen/window size. @@ -60,12 +60,7 @@ void vo_scale_compute_ideal_size (vo_scale_t *this) { switch (this->user_ratio) { case XINE_VO_ASPECT_AUTO: - if (this->delivered_ratio <= 0.0) { - /* no way, that's crazy */ - desired_ratio = image_ratio; - } else { - desired_ratio = this->delivered_ratio; - } + desired_ratio = this->delivered_ratio; break; case XINE_VO_ASPECT_ANAMORPHIC: desired_ratio = 16.0 / 9.0; |