RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 08:12:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix compilation with --disable-yasm. 10l to me.

Browse Source 
Originally committed as revision 24617 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2010-07-31 16:17:54 +00:00
parent 1de4cfe635
commit 0913a92a59
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/imgconvert.c
View File

@ -38,7 +38,7 @@
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavcore/imgutils.h" #include "libavcore/imgutils.h"
#if HAVE_MMX #if HAVE_MMX && HAVE_YASM
#include "x86/dsputil_mmx.h" #include "x86/dsputil_mmx.h"
#endif #endif
@ -54,7 +54,7 @@
#define FF_PIXEL_PACKED 1 /**< only one components containing all the channels */ #define FF_PIXEL_PACKED 1 /**< only one components containing all the channels */
#define FF_PIXEL_PALETTE 2 /**< one components containing indexes for a palette */ #define FF_PIXEL_PALETTE 2 /**< one components containing indexes for a palette */
#if HAVE_MMX #if HAVE_MMX && HAVE_YASM
#define deinterlace_line_inplace ff_deinterlace_line_inplace_mmx #define deinterlace_line_inplace ff_deinterlace_line_inplace_mmx
#define deinterlace_line ff_deinterlace_line_mmx #define deinterlace_line ff_deinterlace_line_mmx
#else #else
@ -1126,7 +1126,7 @@ int img_get_alpha_info(const AVPicture *src,
return ret; return ret;
} }
#if !HAVE_MMX #if !(HAVE_MMX && HAVE_YASM)
/* filter parameters: [-1 4 2 4 -1] // 8 */ /* filter parameters: [-1 4 2 4 -1] // 8 */
static void deinterlace_line_c(uint8_t *dst, static void deinterlace_line_c(uint8_t *dst,
const uint8_t *lum_m4, const uint8_t *lum_m3, const uint8_t *lum_m4, const uint8_t *lum_m3,