[vlc-commits] Swscale: fix small logic error

Jean-Baptiste Kempf git at videolan.org
Wed Jul 11 23:23:27 CEST 2012


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jul 12 01:23:10 2012 +0200| [b58fffd09908bbb18eb7a17dd97f59809560b15c] | committer: Jean-Baptiste Kempf

Swscale: fix small logic error

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b58fffd09908bbb18eb7a17dd97f59809560b15c
---

 modules/video_filter/swscale.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/video_filter/swscale.c b/modules/video_filter/swscale.c
index 43e9fc0..c77ce62 100644
--- a/modules/video_filter/swscale.c
+++ b/modules/video_filter/swscale.c
@@ -307,7 +307,7 @@ static int GetParameters( ScalerConfiguration *p_cfg,
     FixParameters( &i_fmti, &b_has_ai, &b_swap_uvi, p_fmti->i_chroma );
     FixParameters( &i_fmto, &b_has_ao, &b_swap_uvo, p_fmto->i_chroma );
 
-#if !defined (__ANDROID__) || !TARGET_OS_IPHONE
+#if !defined (__ANDROID__) && !TARGET_OS_IPHONE
     /* FIXME TODO removed when ffmpeg is fixed
      * Without SWS_ACCURATE_RND the quality is really bad for some conversions */
     switch( i_fmto )



More information about the vlc-commits mailing list