Mercurial > libavcodec.hg
comparison imgconvert.c @ 12317:0046ee0d227c libavcodec
Fix compilation with --disable-yasm. 10l to me.
| author | vitor |
|---|---|
| date | Sat, 31 Jul 2010 16:17:54 +0000 |
| parents | b01d01738bc4 |
| children | 035ca6548e29 |
comparison
equal
deleted
inserted
replaced
| 12316:b01d01738bc4 | 12317:0046ee0d227c |
|---|---|
| 36 #include "imgconvert.h" | 36 #include "imgconvert.h" |
| 37 #include "libavutil/colorspace.h" | 37 #include "libavutil/colorspace.h" |
| 38 #include "libavutil/pixdesc.h" | 38 #include "libavutil/pixdesc.h" |
| 39 #include "libavcore/imgutils.h" | 39 #include "libavcore/imgutils.h" |
| 40 | 40 |
| 41 #if HAVE_MMX | 41 #if HAVE_MMX && HAVE_YASM |
| 42 #include "x86/dsputil_mmx.h" | 42 #include "x86/dsputil_mmx.h" |
| 43 #endif | 43 #endif |
| 44 | 44 |
| 45 #define xglue(x, y) x ## y | 45 #define xglue(x, y) x ## y |
| 46 #define glue(x, y) xglue(x, y) | 46 #define glue(x, y) xglue(x, y) |
| 52 | 52 |
| 53 #define FF_PIXEL_PLANAR 0 /**< each channel has one component in AVPicture */ | 53 #define FF_PIXEL_PLANAR 0 /**< each channel has one component in AVPicture */ |
| 54 #define FF_PIXEL_PACKED 1 /**< only one components containing all the channels */ | 54 #define FF_PIXEL_PACKED 1 /**< only one components containing all the channels */ |
| 55 #define FF_PIXEL_PALETTE 2 /**< one components containing indexes for a palette */ | 55 #define FF_PIXEL_PALETTE 2 /**< one components containing indexes for a palette */ |
| 56 | 56 |
| 57 #if HAVE_MMX | 57 #if HAVE_MMX && HAVE_YASM |
| 58 #define deinterlace_line_inplace ff_deinterlace_line_inplace_mmx | 58 #define deinterlace_line_inplace ff_deinterlace_line_inplace_mmx |
| 59 #define deinterlace_line ff_deinterlace_line_mmx | 59 #define deinterlace_line ff_deinterlace_line_mmx |
| 60 #else | 60 #else |
| 61 #define deinterlace_line_inplace deinterlace_line_inplace_c | 61 #define deinterlace_line_inplace deinterlace_line_inplace_c |
| 62 #define deinterlace_line deinterlace_line_c | 62 #define deinterlace_line deinterlace_line_c |
| 1124 break; | 1124 break; |
| 1125 } | 1125 } |
| 1126 return ret; | 1126 return ret; |
| 1127 } | 1127 } |
| 1128 | 1128 |
| 1129 #if !HAVE_MMX | 1129 #if !(HAVE_MMX && HAVE_YASM) |
| 1130 /* filter parameters: [-1 4 2 4 -1] // 8 */ | 1130 /* filter parameters: [-1 4 2 4 -1] // 8 */ |
| 1131 static void deinterlace_line_c(uint8_t *dst, | 1131 static void deinterlace_line_c(uint8_t *dst, |
| 1132 const uint8_t *lum_m4, const uint8_t *lum_m3, | 1132 const uint8_t *lum_m4, const uint8_t *lum_m3, |
| 1133 const uint8_t *lum_m2, const uint8_t *lum_m1, | 1133 const uint8_t *lum_m2, const uint8_t *lum_m1, |
| 1134 const uint8_t *lum, | 1134 const uint8_t *lum, |