[vlc-commits] image: remove legacy error check
Steve Lhomme
git at videolan.org
Thu Feb 7 13:40:24 CET 2019
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Feb 7 12:26:59 2019 +0100| [c27baa64c0eb88f945da183d661b3adc557c3509] | committer: Steve Lhomme
image: remove legacy error check
A converter is not going to write in the source picture, it's always providing
a new picture of its output format.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c27baa64c0eb88f945da183d661b3adc557c3509
---
src/misc/image.c | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/src/misc/image.c b/src/misc/image.c
index 00e09c3952..8a841a7189 100644
--- a/src/misc/image.c
+++ b/src/misc/image.c
@@ -506,8 +506,6 @@ static picture_t *ImageConvert( image_handler_t *p_image, picture_t *p_pic,
const video_format_t *p_fmt_in,
video_format_t *p_fmt_out )
{
- picture_t *p_pif;
-
if( !p_fmt_out->i_width && !p_fmt_out->i_height &&
p_fmt_out->i_sar_num && p_fmt_out->i_sar_den &&
p_fmt_out->i_sar_num * p_fmt_in->i_sar_den !=
@@ -565,20 +563,7 @@ static picture_t *ImageConvert( image_handler_t *p_image, picture_t *p_pic,
picture_Hold( p_pic );
- p_pif = p_image->p_converter->pf_video_filter( p_image->p_converter, p_pic );
-
- if( p_fmt_in->i_chroma == p_fmt_out->i_chroma &&
- p_fmt_in->i_width == p_fmt_out->i_width &&
- p_fmt_in->i_height == p_fmt_out->i_height )
- {
- /* Duplicate image */
- picture_Release( p_pif ); /* XXX: Better fix must be possible */
- p_pif = filter_NewPicture( p_image->p_converter );
- if( p_pif )
- picture_Copy( p_pif, p_pic );
- }
-
- return p_pif;
+ return p_image->p_converter->pf_video_filter( p_image->p_converter, p_pic );
}
/**
More information about the vlc-commits
mailing list