diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
| commit | e46ce9c0ac88cdc3b4604c249576cfde0c5c4946 (patch) | |
| tree | 6553efdc461e8d81ae2c9a7508b2dec5f116905a /libswscale | |
| parent | e51225dc3135e69d3f0fe6a5502c0c0e77952056 (diff) | |
| parent | 14eb21fce00bfcab5145140f22bfd706d991c101 (diff) | |
| download | mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.bz2 mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.xz | |
Merge svn changes up to r27899
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/Makefile | 6 | ||||
| -rw-r--r-- | libswscale/cs_test.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libswscale/Makefile b/libswscale/Makefile index fa96e09a8f..84675e0c88 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -5,16 +5,16 @@ FFLIBS = avutil OBJS = rgb2rgb.o swscale.o swscale_avoption.o -OBJS-$(ARCH_BFIN) += swscale_bfin.o yuv2rgb_bfin.o +OBJS-$(ARCH_BFIN) += internal_bfin.o swscale_bfin.o yuv2rgb_bfin.o OBJS-$(CONFIG_GPL) += yuv2rgb.o OBJS-$(CONFIG_MLIB) += yuv2rgb_mlib.o OBJS-$(HAVE_ALTIVEC) += yuv2rgb_altivec.o OBJS-$(HAVE_VIS) += yuv2rgb_vis.o -ASM_OBJS-$(ARCH_BFIN) += internal_bfin.o - HEADERS = swscale.h +TESTS = cs_test swscale-example + CLEANFILES = cs_test swscale-example include $(SUBDIR)../subdir.mak diff --git a/libswscale/cs_test.c b/libswscale/cs_test.c index d49a60582f..2223ee3a31 100644 --- a/libswscale/cs_test.c +++ b/libswscale/cs_test.c @@ -75,7 +75,7 @@ int main(int argc, char **argv) struct func_info_s { int src_bpp; int dst_bpp; - char *name; + const char *name; void (*func)(const uint8_t *src, uint8_t *dst, long src_size); } func_info[] = { FUNC(2, 2, rgb15to16), @@ -127,7 +127,7 @@ int main(int argc, char **argv) for(srcOffset=128; srcOffset<196; srcOffset+=4){ uint8_t *src= srcBuffer+srcOffset; uint8_t *dst= dstBuffer+dstOffset; - char *name=NULL; + const char *name=NULL; if(failed) break; //don't fill the screen with shit ... |