summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2002-09-08 16:52:57 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2002-09-08 16:52:57 +0000
commit0fb9609e42f9649fa727ceef861a05cbf0f44e32 (patch)
treeab15978462f4224af112f7d0c2e6474721d27eaa
parentdf42925e0db31a9970d40c76b891900595731b13 (diff)
downloadxine-lib-0fb9609e42f9649fa727ceef861a05cbf0f44e32.tar.gz
xine-lib-0fb9609e42f9649fa727ceef861a05cbf0f44e32.tar.bz2
copy & paste at the wrong place
CVS patchset: 2628 CVS date: 2002/09/08 16:52:57
-rw-r--r--src/xine-engine/vo_scale.c3
-rw-r--r--src/xine-engine/vo_scale.h6
2 files changed, 4 insertions, 5 deletions
diff --git a/src/xine-engine/vo_scale.c b/src/xine-engine/vo_scale.c
index 1cc10572a..cceaf68d3 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.7 2002/09/08 16:20:13 mroi Exp $
+ * $Id: vo_scale.c,v 1.8 2002/09/08 16:52:57 mroi Exp $
*
* Contains common code to calculate video scaling parameters.
* In short, it will map frame dimensions to screen/window size.
@@ -57,7 +57,6 @@ void vo_scale_compute_ideal_size (vo_scale_t *this) {
image_ratio = (double) this->delivered_width / (double) this->delivered_height;
- printf("vo_scale: DEBUG: user ratio %d, delivered ratio %d\n", this->user_ratio, this->delivered_ratio_code);
switch (this->user_ratio) {
case ASPECT_AUTO:
switch (this->delivered_ratio_code) {
diff --git a/src/xine-engine/vo_scale.h b/src/xine-engine/vo_scale.h
index 317cc4082..953134512 100644
--- a/src/xine-engine/vo_scale.h
+++ b/src/xine-engine/vo_scale.h
@@ -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.h,v 1.3 2002/09/08 16:20:13 mroi Exp $
+ * $Id: vo_scale.h,v 1.4 2002/09/08 16:52:57 mroi Exp $
*
* vo_scale.h
*
@@ -123,8 +123,8 @@ struct vo_scale_s {
void (*dest_size_cb) (void *user_data,
int video_width, int video_height,
double video_pixel_aspect,
- double *dest_pixel_aspect,
- int *dest_width, int *dest_height);
+ int *dest_width, int *dest_height,
+ double *dest_pixel_aspect);
/* borders */
vo_scale_rect_t border[4];