summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2011-01-03 10:29:17 +0000
committerphintuka <phintuka>2011-01-03 10:29:17 +0000
commit2d411d8b0806588dc4f72608a79fbb01d892b516 (patch)
tree7d42e6777c74bb270b81a0eb2f5f84ffb706c7d6
parent01d05365cd3aa8a85e65a0428d379be6c87f1d35 (diff)
downloadxineliboutput-2d411d8b0806588dc4f72608a79fbb01d892b516.tar.gz
xineliboutput-2d411d8b0806588dc4f72608a79fbb01d892b516.tar.bz2
Fixed 1.42. Closes sf bug #3146413.
(Thanks to durchflieger)
-rw-r--r--xine_post_autocrop.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/xine_post_autocrop.c b/xine_post_autocrop.c
index f4f4e780..7d8cbb19 100644
--- a/xine_post_autocrop.c
+++ b/xine_post_autocrop.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: xine_post_autocrop.c,v 1.42 2010-11-26 12:57:24 phintuka Exp $
+ * $Id: xine_post_autocrop.c,v 1.43 2011-01-03 10:29:17 phintuka Exp $
*
*/
@@ -666,10 +666,9 @@ static int blank_line_YUY2_INIT(uint8_t *data, int length)
int dbg_top=0, dbg_bottom=0;
#endif
-static int analyze_frame_yv12(vo_frame_t *frame, int *crop_top, int *crop_bottom)
+static int analyze_frame_yv12(autocrop_post_plugin_t *this, vo_frame_t *frame,
+ int *crop_top, int *crop_bottom)
{
- post_video_port_t *port = (post_video_port_t *)frame->port;
- autocrop_post_plugin_t *this = (autocrop_post_plugin_t *)port->post;
int y;
int ypitch = frame->pitches[0];
int upitch = frame->pitches[1];
@@ -738,10 +737,9 @@ static int analyze_frame_yv12(vo_frame_t *frame, int *crop_top, int *crop_bottom
return 1;
}
-static int analyze_frame_yuy2(vo_frame_t *frame, int *crop_top, int *crop_bottom)
+static int analyze_frame_yuy2(autocrop_post_plugin_t *this, vo_frame_t *frame,
+ int *crop_top, int *crop_bottom)
{
- post_video_port_t *port = (post_video_port_t *)frame->port;
- autocrop_post_plugin_t *this = (autocrop_post_plugin_t *)port->post;
int y;
int pitch = frame->pitches[0];
uint8_t *data = frame->base[0];
@@ -828,9 +826,9 @@ static void analyze_frame(vo_frame_t *frame, int *crop_top, int *crop_bottom)
int result = 0;
if(frame->format == XINE_IMGFMT_YV12)
- result = analyze_frame_yv12(frame, &start_line, &end_line);
+ result = analyze_frame_yv12(this, frame, &start_line, &end_line);
else if(frame->format == XINE_IMGFMT_YUY2)
- result = analyze_frame_yuy2(frame, &start_line, &end_line);
+ result = analyze_frame_yuy2(this, frame, &start_line, &end_line);
#if defined(__MMX__)
_mm_empty();