summaryrefslogtreecommitdiff
path: root/src/post/planar
diff options
context:
space:
mode:
Diffstat (limited to 'src/post/planar')
-rw-r--r--src/post/planar/boxblur.c6
-rw-r--r--src/post/planar/denoise3d.c6
-rw-r--r--src/post/planar/eq.c6
-rw-r--r--src/post/planar/eq2.c6
-rw-r--r--src/post/planar/expand.c4
-rw-r--r--src/post/planar/invert.c4
-rw-r--r--src/post/planar/unsharp.c6
7 files changed, 19 insertions, 19 deletions
diff --git a/src/post/planar/boxblur.c b/src/post/planar/boxblur.c
index 8729da5c5..331cd2b6b 100644
--- a/src/post/planar/boxblur.c
+++ b/src/post/planar/boxblur.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: boxblur.c,v 1.4 2003/08/04 03:47:10 miguelfreitas Exp $
+ * $Id: boxblur.c,v 1.5 2003/08/12 13:56:26 mroi Exp $
*
* mplayer's boxblur
* Copyright (C) 2002 Michael Niedermayer <michaelni@gmx.at>
@@ -416,7 +416,7 @@ static int boxblur_draw(vo_frame_t *frame, xine_stream_t *stream)
if( frame->format != XINE_IMGFMT_YV12 ) {
yv12_frame = port->original_port->get_frame(port->original_port,
- frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, VO_BOTH_FIELDS);
+ frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS);
yv12_frame->pts = frame->pts;
yv12_frame->duration = frame->duration;
@@ -435,7 +435,7 @@ static int boxblur_draw(vo_frame_t *frame, xine_stream_t *stream)
out_frame = port->original_port->get_frame(port->original_port,
- frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, VO_BOTH_FIELDS);
+ frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS);
extra_info_merge(out_frame->extra_info, frame->extra_info);
diff --git a/src/post/planar/denoise3d.c b/src/post/planar/denoise3d.c
index 2cc394596..af38165e9 100644
--- a/src/post/planar/denoise3d.c
+++ b/src/post/planar/denoise3d.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: denoise3d.c,v 1.4 2003/08/04 03:47:10 miguelfreitas Exp $
+ * $Id: denoise3d.c,v 1.5 2003/08/12 13:56:26 mroi Exp $
*
* mplayer's denoise3d
* Copyright (C) 2003 Daniel Moreno <comac@comac.darktech.org>
@@ -427,7 +427,7 @@ static int denoise3d_draw(vo_frame_t *frame, xine_stream_t *stream)
if( frame->format != XINE_IMGFMT_YV12 ) {
yv12_frame = port->original_port->get_frame(port->original_port,
- frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, VO_BOTH_FIELDS);
+ frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS);
yv12_frame->pts = frame->pts;
yv12_frame->duration = frame->duration;
@@ -446,7 +446,7 @@ static int denoise3d_draw(vo_frame_t *frame, xine_stream_t *stream)
out_frame = port->original_port->get_frame(port->original_port,
- frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, VO_BOTH_FIELDS);
+ frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS);
extra_info_merge(out_frame->extra_info, frame->extra_info);
diff --git a/src/post/planar/eq.c b/src/post/planar/eq.c
index c0af88d78..b83e058b6 100644
--- a/src/post/planar/eq.c
+++ b/src/post/planar/eq.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: eq.c,v 1.3 2003/08/04 03:47:11 miguelfreitas Exp $
+ * $Id: eq.c,v 1.4 2003/08/12 13:56:26 mroi Exp $
*
* mplayer's eq (soft video equalizer)
* Copyright (C) Richard Felker
@@ -460,7 +460,7 @@ static int eq_draw(vo_frame_t *frame, xine_stream_t *stream)
if( frame->format != XINE_IMGFMT_YV12 ) {
yv12_frame = port->original_port->get_frame(port->original_port,
- frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, VO_BOTH_FIELDS);
+ frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS);
yv12_frame->pts = frame->pts;
yv12_frame->duration = frame->duration;
@@ -479,7 +479,7 @@ static int eq_draw(vo_frame_t *frame, xine_stream_t *stream)
out_frame = port->original_port->get_frame(port->original_port,
- frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, VO_BOTH_FIELDS);
+ frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS);
extra_info_merge(out_frame->extra_info, frame->extra_info);
diff --git a/src/post/planar/eq2.c b/src/post/planar/eq2.c
index 680035625..0836f4139 100644
--- a/src/post/planar/eq2.c
+++ b/src/post/planar/eq2.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: eq2.c,v 1.4 2003/08/04 03:47:11 miguelfreitas Exp $
+ * $Id: eq2.c,v 1.5 2003/08/12 13:56:26 mroi Exp $
*
* mplayer's eq2 (soft video equalizer)
* Software equalizer (brightness, contrast, gamma, saturation)
@@ -657,7 +657,7 @@ static int eq2_draw(vo_frame_t *frame, xine_stream_t *stream)
if( frame->format != XINE_IMGFMT_YV12 ) {
yv12_frame = port->original_port->get_frame(port->original_port,
- frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, VO_BOTH_FIELDS);
+ frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS);
yv12_frame->pts = frame->pts;
yv12_frame->duration = frame->duration;
@@ -675,7 +675,7 @@ static int eq2_draw(vo_frame_t *frame, xine_stream_t *stream)
}
out_frame = port->original_port->get_frame(port->original_port,
- frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, VO_BOTH_FIELDS);
+ frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS);
extra_info_merge(out_frame->extra_info, frame->extra_info);
diff --git a/src/post/planar/expand.c b/src/post/planar/expand.c
index f585a22ce..b9dcc9ee8 100644
--- a/src/post/planar/expand.c
+++ b/src/post/planar/expand.c
@@ -236,12 +236,12 @@ static int expand_draw(vo_frame_t *frame, xine_stream_t *stream)
int size, i, skip, new_height, border_height;
/* Calculate height of expanded frame */
- new_height = (double) frame->width * frame->ratio * 3.0 / 4.0;
+ new_height = (double) frame->height * frame->ratio * 3.0 / 4.0;
new_height = (new_height + 1) & ~1;
if(new_height > frame->height) {
expanded_frame = port->original_port->get_frame(port->original_port,
- frame->width, new_height, frame->ratio, frame->format, VO_BOTH_FIELDS);
+ frame->width, new_height, 4.0 / 3.0, frame->format, frame->flags | VO_BOTH_FIELDS);
expanded_frame->pts = frame->pts;
expanded_frame->duration = frame->duration;
expanded_frame->bad_frame = frame->bad_frame;
diff --git a/src/post/planar/invert.c b/src/post/planar/invert.c
index 76f13de34..c81d3e12a 100644
--- a/src/post/planar/invert.c
+++ b/src/post/planar/invert.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: invert.c,v 1.11 2003/08/04 03:47:11 miguelfreitas Exp $
+ * $Id: invert.c,v 1.12 2003/08/12 13:56:26 mroi Exp $
*/
/*
@@ -236,7 +236,7 @@ static int invert_draw(vo_frame_t *frame, xine_stream_t *stream)
int size, i, skip;
inverted_frame = port->original_port->get_frame(port->original_port,
- frame->width, frame->height, frame->ratio, frame->format, VO_BOTH_FIELDS);
+ frame->width, frame->height, frame->ratio, frame->format, frame->flags | VO_BOTH_FIELDS);
inverted_frame->pts = frame->pts;
inverted_frame->duration = frame->duration;
inverted_frame->bad_frame = frame->bad_frame;
diff --git a/src/post/planar/unsharp.c b/src/post/planar/unsharp.c
index 4564bbcc6..1c7aa18d1 100644
--- a/src/post/planar/unsharp.c
+++ b/src/post/planar/unsharp.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: unsharp.c,v 1.4 2003/08/04 03:47:11 miguelfreitas Exp $
+ * $Id: unsharp.c,v 1.5 2003/08/12 13:56:26 mroi Exp $
*
* mplayer's unsharp
* Copyright (C) 2002 Rémi Guyomarch <rguyom@pobox.com>
@@ -469,7 +469,7 @@ static int unsharp_draw(vo_frame_t *frame, xine_stream_t *stream)
if( frame->format != XINE_IMGFMT_YV12 ) {
yv12_frame = port->original_port->get_frame(port->original_port,
- frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, VO_BOTH_FIELDS);
+ frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS);
yv12_frame->pts = frame->pts;
yv12_frame->duration = frame->duration;
@@ -488,7 +488,7 @@ static int unsharp_draw(vo_frame_t *frame, xine_stream_t *stream)
out_frame = port->original_port->get_frame(port->original_port,
- frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, VO_BOTH_FIELDS);
+ frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS);
extra_info_merge(out_frame->extra_info, frame->extra_info);
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 10:32:12 +0000