diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 03:20:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 03:20:29 +0200 |
| commit | 61ced71d79ebef22f8ab6ee3511a7a989f6fd3ac (patch) | |
| tree | 6000ca917b87276d4e29b6ff5ca4fb7d0fee5b30 /library.mak | |
| parent | d57ca5e5a8ba993630c87fbc87ed1f8267309278 (diff) | |
| parent | 581281e242609a222233a2e5538b89dfb88fb18e (diff) | |
| download | ffmpeg-61ced71d79ebef22f8ab6ee3511a7a989f6fd3ac.tar.gz | |
Merge commit '581281e242609a222233a2e5538b89dfb88fb18e'
* commit '581281e242609a222233a2e5538b89dfb88fb18e':
matroskadec: check realloc in lzo encoding
matroska: honor error_recognition on unknown doctypes
tiffdec: Add support for GRAY16LE.
tiffenc: Add support for little endian RGB48 and GRAY16
mpeg4: support frame parameter changes with frame-mt
mpegvideo: check ff_find_unused_picture() return value for errors
mpegvideo: release frame buffers before freeing them
configure: msvc: default to 'lib' as 'ar' tool
build: support some non-standard ar variants
Conflicts:
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/tiff.c
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'library.mak')
| -rw-r--r-- | library.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library.mak b/library.mak index e943615ba7..821fe7e3dd 100644 --- a/library.mak +++ b/library.mak @@ -25,7 +25,7 @@ $(TESTOBJS): CPPFLAGS += -DTEST $(SUBDIR)$(LIBNAME): $(OBJS) $(RM) $@ - $(AR) rc $@ $^ $(EXTRAOBJS) + $(AR) $(ARFLAGS) $(AR_O) $^ $(EXTRAOBJS) $(RANLIB) $@ install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig |