diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-13 23:31:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-13 23:44:12 +0200 |
| commit | cac9877ed5150bb6feda64927bb327ee4698086a (patch) | |
| tree | 17f92a30adce99c085b48a05f646f7cf13492952 /libswscale/Makefile | |
| parent | 5ad01decef9993e4ec84c10e53a01f9f841c330b (diff) | |
| parent | e0c3e0738757a92c2910bac83f2ef830b428ba11 (diff) | |
| download | ffmpeg-streaming-cac9877ed5150bb6feda64927bb327ee4698086a.zip ffmpeg-streaming-cac9877ed5150bb6feda64927bb327ee4698086a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
sws: implement MMX/SSE2/SSSE3/SSE4 versions for horizontal scaling.
include stdint.h in adpcm_data.h
mpeg12: reorder functions to avoid ugly forward declarations
Fixed off by one packet size allocation in the smacker demuxer.
Check for invalid packet size in the smacker demuxer.
ape demuxer: fix segfault on memory allocation failure.
xan: Add some buffer checks
xan: Remove extra trailing newline
Fixed size given to init_get_bits() in xan decoder.
Conflicts:
libavcodec/mpeg12.c
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/Makefile')
| -rw-r--r-- | libswscale/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libswscale/Makefile b/libswscale/Makefile index 9720620..7f74677 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -19,6 +19,7 @@ OBJS-$(HAVE_MMX) += x86/rgb2rgb.o \ x86/swscale_mmx.o \ x86/yuv2rgb_mmx.o OBJS-$(HAVE_VIS) += sparc/yuv2rgb_vis.o +OBJS-$(HAVE_YASM) += x86/scale.o TESTPROGS = colorspace swscale |
