Clarify that some of the non-SIMD code is now LGPLed.

[coroid/ffmpeg_saccubus.git] / libswscale / swscale.c

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 09261e6..eb9092c 100644 (file)
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -17,8 +17,8 @@
  * along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  *
- * the C code (not assembly, mmx, ...) of the swscaler which has been written
- * by Michael Niedermayer can be used under the LGPL license too
+ * the C code (not assembly, mmx, ...) of this file can be used
+ * under the LGPL license too
  */
 
 /*
@@ -109,7 +109,7 @@ untested special converters
 
 #define isSupportedIn(x)  ((x)==PIX_FMT_YUV420P || (x)==PIX_FMT_YUYV422 || (x)==PIX_FMT_UYVY422\
                        || (x)==PIX_FMT_RGB32|| (x)==PIX_FMT_BGR24|| (x)==PIX_FMT_BGR565|| (x)==PIX_FMT_BGR555\
-                       || (x)==PIX_FMT_BGR32|| (x)==PIX_FMT_RGB24\
+                       || (x)==PIX_FMT_BGR32|| (x)==PIX_FMT_RGB24|| (x)==PIX_FMT_RGB565|| (x)==PIX_FMT_RGB555\
                        || (x)==PIX_FMT_GRAY8 || (x)==PIX_FMT_YUV410P\
                        || (x)==PIX_FMT_GRAY16BE || (x)==PIX_FMT_GRAY16LE\
                        || (x)==PIX_FMT_YUV444P || (x)==PIX_FMT_YUV422P || (x)==PIX_FMT_YUV411P)
@@ -2297,29 +2297,29 @@ SwsContext *sws_getContext(int srcW, int srcH, int srcFormat, int dstW, int dstH
                char *dither= "";
 #endif
                if(flags&SWS_FAST_BILINEAR)
-                       MSG_INFO("\nSwScaler: FAST_BILINEAR scaler, ");
+                       MSG_INFO("SwScaler: FAST_BILINEAR scaler, ");
                else if(flags&SWS_BILINEAR)
-                       MSG_INFO("\nSwScaler: BILINEAR scaler, ");
+                       MSG_INFO("SwScaler: BILINEAR scaler, ");
                else if(flags&SWS_BICUBIC)
-                       MSG_INFO("\nSwScaler: BICUBIC scaler, ");
+                       MSG_INFO("SwScaler: BICUBIC scaler, ");
                else if(flags&SWS_X)
-                       MSG_INFO("\nSwScaler: Experimental scaler, ");
+                       MSG_INFO("SwScaler: Experimental scaler, ");
                else if(flags&SWS_POINT)
-                       MSG_INFO("\nSwScaler: Nearest Neighbor / POINT scaler, ");
+                       MSG_INFO("SwScaler: Nearest Neighbor / POINT scaler, ");
                else if(flags&SWS_AREA)
-                       MSG_INFO("\nSwScaler: Area Averageing scaler, ");
+                       MSG_INFO("SwScaler: Area Averageing scaler, ");
                else if(flags&SWS_BICUBLIN)
-                       MSG_INFO("\nSwScaler: luma BICUBIC / chroma BILINEAR scaler, ");
+                       MSG_INFO("SwScaler: luma BICUBIC / chroma BILINEAR scaler, ");
                else if(flags&SWS_GAUSS)
-                       MSG_INFO("\nSwScaler: Gaussian scaler, ");
+                       MSG_INFO("SwScaler: Gaussian scaler, ");
                else if(flags&SWS_SINC)
-                       MSG_INFO("\nSwScaler: Sinc scaler, ");
+                       MSG_INFO("SwScaler: Sinc scaler, ");
                else if(flags&SWS_LANCZOS)
-                       MSG_INFO("\nSwScaler: Lanczos scaler, ");
+                       MSG_INFO("SwScaler: Lanczos scaler, ");
                else if(flags&SWS_SPLINE)
-                       MSG_INFO("\nSwScaler: Bicubic spline scaler, ");
+                       MSG_INFO("SwScaler: Bicubic spline scaler, ");
                else
-                       MSG_INFO("\nSwScaler: ehh flags invalid?! ");
+                       MSG_INFO("SwScaler: ehh flags invalid?! ");
 
                if(dstFormat==PIX_FMT_BGR555 || dstFormat==PIX_FMT_BGR565)
                        MSG_INFO("from %s to%s %s ",