diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 21:21:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 21:50:37 +0200 |
| commit | 367d9b2957fa455b59f131fd6bee896cb7ed6600 (patch) | |
| tree | 4c6f6a32752bc64d7aea93e37d4bd5666cd6ecb9 /libavutil | |
| parent | 62e5ef95cacb29b5ee3149792f12f9204dbd1655 (diff) | |
| parent | ef0ee7f657e66d91162d2b4fad882ece9fbb264e (diff) | |
| download | ffmpeg-367d9b2957fa455b59f131fd6bee896cb7ed6600.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: K&R formatting cosmetics (part II)
tiffdec: Add a malloc check and refactor another.
faxcompr: Check malloc results and unify return path
configure: escape colons in values written to config.fate
ac3dsp: call femms/emms at the end of float_to_fixed24() for 3DNow and SSE
matroska: Fix leaking memory allocated for laces.
pthread: Fix crash due to fctx->delaying not being cleared.
vp3: Assert on invalid filter_limit values.
h264: fix 10bit biweight functions after recent x86inc.asm fixes.
ffv1: Fix size mismatch in encode_line.
movenc: Remove a dead initialization
git-howto: Explain how to avoid Windows line endings in git checkouts.
build: Move all arch OBJS declarations into arch subdirectory Makefiles.
Conflicts:
configure
libavcodec/vp3.c
libavformat/matroskadec.c
libavutil/Makefile
libswscale/Makefile
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/Makefile | 3 | ||||
| -rw-r--r-- | libavutil/ppc/Makefile | 1 | ||||
| -rw-r--r-- | libavutil/x86/Makefile | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index 9b562335b0..ed7de258ac 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -79,9 +79,6 @@ OBJS = adler32.o \ tree.o \ utils.o \ -OBJS-$(ARCH_PPC) += ppc/cpu.o -OBJS-$(ARCH_X86) += x86/cpu.o - TESTPROGS = adler32 aes avstring base64 bprint cpu crc des eval file fifo \ lfg lls md5 opt pca parseutils random_seed rational sha tree TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo diff --git a/libavutil/ppc/Makefile b/libavutil/ppc/Makefile new file mode 100644 index 0000000000..5b18b08957 --- /dev/null +++ b/libavutil/ppc/Makefile @@ -0,0 +1 @@ +OBJS += ppc/cpu.o \ diff --git a/libavutil/x86/Makefile b/libavutil/x86/Makefile new file mode 100644 index 0000000000..de8a341442 --- /dev/null +++ b/libavutil/x86/Makefile @@ -0,0 +1 @@ +OBJS += x86/cpu.o \ |