diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 13:57:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 13:57:10 +0200 |
| commit | 5717562c789f9be9c8e4bab7caec4df83f77cebe (patch) | |
| tree | 134e045d40aa79aca5d42fd00c72f317cf519a2d /libavutil | |
| parent | 25f3827e1daf6b75e6b46e2bccaf8cbc273d6b42 (diff) | |
| parent | c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d (diff) | |
| download | ffmpeg-5717562c789f9be9c8e4bab7caec4df83f77cebe.tar.gz | |
Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d'
* commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d':
rangecoder-test: Return in case of an error
build: simplify enabling of compat objects
Conflicts:
configure
libavutil/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index 841eec5901..d290ff91ca 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -96,9 +96,8 @@ OBJS = adler32.o \ xga_font_data.o \ xtea.o \ -OBJS-$(HAVE_BROKEN_SNPRINTF) += ../compat/msvcrt/snprintf.o -OBJS-$(HAVE_MSVCRT) += ../compat/strtod.o +OBJS += $(COMPAT_OBJS:%=../compat/%) SKIPHEADERS = old_pix_fmts.h |