]>
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 | |
01fb7740 | 3 | @@ -376,9 +376,7 @@ |
5fb70264 | 4 | |
01fb7740 | 5 | OBJS-$(HAVE_XVMC) += xvmcvideo.o |
5fb70264 | 6 | |
01fb7740 | 7 | -ifndef CONFIG_SWSCALE |
5fb70264 AM |
8 | OBJS += imgresample.o |
9 | -endif | |
10 | ||
11 | # processor-specific code | |
01fb7740 | 12 | ifdef HAVE_MMX |
c657ca1c AM |
13 | --- ffmpeg/libavcodec/imgconvert.c~ 2008-08-03 02:41:31.000000000 +0200 |
14 | +++ ffmpeg/libavcodec/imgconvert.c 2008-08-23 00:06:15.552030129 +0200 | |
15 | @@ -2108,7 +2108,6 @@ | |
bc5dac56 | 16 | } |
c657ca1c | 17 | #endif |
bc5dac56 | 18 | |
c657ca1c AM |
19 | -#ifndef CONFIG_SWSCALE |
20 | static uint8_t y_ccir_to_jpeg[256]; | |
21 | static uint8_t y_jpeg_to_ccir[256]; | |
22 | static uint8_t c_ccir_to_jpeg[256]; | |
23 | @@ -2628,7 +2627,6 @@ | |
bc5dac56 SS |
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) |