From fccaa92c14cdcc86a8a28e1995d28914efa370f7 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 17 Jun 2005 22:36:43 +0000 Subject: ** BUGFIX ** Copy frame crop values when copying frame information. (Reinhard Nissl) CVS patchset: 7629 CVS date: 2005/06/17 22:36:43 --- src/post/deinterlace/xine_plugin.c | 9 +++++++-- src/xine-engine/post.c | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c index 659947e3f..aa43c5dee 100644 --- a/src/post/deinterlace/xine_plugin.c +++ b/src/post/deinterlace/xine_plugin.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: xine_plugin.c,v 1.44 2005/06/05 16:00:06 miguelfreitas Exp $ + * $Id: xine_plugin.c,v 1.45 2005/06/17 22:36:43 dsalt Exp $ * * advanced video deinterlacer plugin * Jun/2003 by Miguel Freitas @@ -585,7 +585,12 @@ static int deinterlace_build_output_field( frame->width, frame->height / scaler, frame->ratio, yuy2_frame->format, frame->flags | VO_BOTH_FIELDS); pthread_mutex_lock (&this->lock); - + + deinterlaced_frame->crop_left = frame->crop_left; + deinterlaced_frame->crop_right = frame->crop_right; + deinterlaced_frame->crop_top = frame->crop_top; + deinterlaced_frame->crop_bottom = frame->crop_bottom; + _x_extra_info_merge(deinterlaced_frame->extra_info, frame->extra_info); if( skip > 0 && !this->pulldown ) { diff --git a/src/xine-engine/post.c b/src/xine-engine/post.c index 4b2da8afc..62eb31a78 100644 --- a/src/xine-engine/post.c +++ b/src/xine-engine/post.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: post.c,v 1.29 2005/05/07 09:11:39 valtri Exp $ + * $Id: post.c,v 1.30 2005/06/17 22:36:48 dsalt Exp $ */ /* @@ -420,7 +420,11 @@ void _x_post_frame_copy_down(vo_frame_t *from, vo_frame_t *to) { to->drawn = from->drawn; to->accel_data = from->accel_data; to->stream = from->stream; - + to->crop_left = from->crop_left; + to->crop_right = from->crop_right; + to->crop_top = from->crop_top; + to->crop_bottom = from->crop_bottom; + if (to->extra_info != from->extra_info) _x_extra_info_merge(to->extra_info, from->extra_info); } -- cgit v1.2.3