]>
Commit | Line | Data |
---|---|---|
5fb70264 AM |
1 | --- ffmpeg-export-2006-12-04/libavcodec/Makefile.org 2007-07-15 13:53:40.858275149 +0200 |
2 | +++ ffmpeg-export-2006-12-04/libavcodec/Makefile 2007-07-15 13:53:45.208487348 +0200 | |
3 | @@ -321,9 +321,7 @@ | |
4 | ||
5 | OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.o | |
6 | ||
7 | -ifneq ($(CONFIG_SWSCALER),yes) | |
8 | OBJS += imgresample.o | |
9 | -endif | |
10 | ||
11 | # processor-specific code | |
12 | ifeq ($(HAVE_MMX),yes) | |
bc5dac56 SS |
13 | --- ffmpeg-export-2006-12-04/libavcodec/imgconvert.c.orig 2006-12-21 17:28:49.000000000 +0000 |
14 | +++ ffmpeg-export-2006-12-04/libavcodec/imgconvert.c 2006-12-21 17:30:07.000000000 +0000 | |
15 | @@ -2299,7 +2299,6 @@ | |
16 | return 0; | |
17 | } | |
18 | ||
19 | -#ifndef CONFIG_SWSCALER | |
20 | /* XXX: always use linesize. Return -1 if not supported */ | |
21 | int img_convert(AVPicture *dst, int dst_pix_fmt, | |
22 | const AVPicture *src, int src_pix_fmt, | |
23 | @@ -2541,7 +2540,6 @@ | |
24 | avpicture_free(tmp); | |
25 | return ret; | |
26 | } | |
27 | -#endif | |
28 | ||
29 | /* NOTE: we scan all the pixels to have an exact information */ | |
30 | static int get_alpha_info_pal8(const AVPicture *src, int width, int height) |