[vlc-commits] image: fix a copy/paste error while refactoring
Erwan Tulou
git at videolan.org
Mon Nov 26 00:44:26 CET 2018
vlc | branch: master | Erwan Tulou <erwan10 at videolan.org> | Mon Nov 26 00:08:22 2018 +0100| [00b337537f53e6cfce363ad4a8947aeb3a86bbbd] | committer: Erwan Tulou
image: fix a copy/paste error while refactoring
this regression, found in 629aa1c03d9e82eff0444f3498738bfcdc629d16,
resulted in skins2 no longer able to decode any bitmaps.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=00b337537f53e6cfce363ad4a8947aeb3a86bbbd
---
src/misc/image.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/misc/image.c b/src/misc/image.c
index 8467dc93e7..3622232d1e 100644
--- a/src/misc/image.c
+++ b/src/misc/image.c
@@ -315,11 +315,11 @@ static picture_t *ImageReadUrl( image_handler_t *p_image, const char *psz_url,
{
fmtin.i_chroma = image_Mime2Fourcc( psz_mime );
free( psz_mime );
- if( !fmtin.i_chroma )
- {
- /* Try to guess format from file name */
- fmtin.i_chroma = image_Ext2Fourcc( psz_url );
- }
+ }
+ if( !fmtin.i_chroma )
+ {
+ /* Try to guess format from file name */
+ fmtin.i_chroma = image_Ext2Fourcc( psz_url );
}
}
vlc_stream_Delete( p_stream );
More information about the vlc-commits
mailing list