[vlc-commits] commit: Cosmetics. (Laurent Aimar )
git at videolan.org
git at videolan.org
Sun Jul 11 19:57:21 CEST 2010
vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Jul 11 19:01:51 2010 +0200| [ce1b1bda347a6e4540b8c418b70f2b46f34726c7] | committer: Laurent Aimar
Cosmetics.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ce1b1bda347a6e4540b8c418b70f2b46f34726c7
---
modules/video_filter/deinterlace.c | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c
index 11a0c49..13b4e06 100644
--- a/modules/video_filter/deinterlace.c
+++ b/modules/video_filter/deinterlace.c
@@ -1567,9 +1567,7 @@ static picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic )
RenderLinear( p_filter, pp_outpic[1], p_pic, p_pic->b_top_field_first );
#endif
msg_Err( p_filter, "doubling the frame rate is not supported yet" );
- picture_Release( p_pic_dst );
- picture_Release( p_pic );
- return NULL;
+ goto drop;
case DEINTERLACE_MEAN:
RenderMean( p_filter, p_pic_dst, p_pic );
@@ -1585,26 +1583,25 @@ static picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic )
case DEINTERLACE_YADIF:
if( RenderYadif( p_filter, p_pic_dst, p_pic, 0, 0 ) )
- {
- picture_Release( p_pic_dst );
- picture_Release( p_pic );
- return NULL;
- }
+ goto drop;
break;
case DEINTERLACE_YADIF2X:
msg_Err( p_filter, "doubling the frame rate is not supported yet" );
//RenderYadif( p_vout, pp_outpic[0], p_pic, 0, !p_pic->b_top_field_first );
//RenderYadif( p_vout, pp_outpic[1], p_pic, 1, p_pic->b_top_field_first );
- picture_Release( p_pic_dst );
- picture_Release( p_pic );
- return NULL;
+ goto drop;
}
p_pic_dst->b_progressive = true;
picture_Release( p_pic );
return p_pic_dst;
+
+drop:
+ picture_Release( p_pic_dst );
+ picture_Release( p_pic );
+ return NULL;
}
static void Flush( filter_t *p_filter )
More information about the vlc-commits
mailing list