-
- Downloads
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>
No related branches found
No related tags found
Showing
- configure 5 additions, 1 deletionconfigure
- doc/git-howto.texi 8 additions, 0 deletionsdoc/git-howto.texi
- libavcodec/faxcompr.c 10 additions, 5 deletionslibavcodec/faxcompr.c
- libavcodec/ffv1.c 1 addition, 1 deletionlibavcodec/ffv1.c
- libavcodec/tiff.c 10 additions, 5 deletionslibavcodec/tiff.c
- libavcodec/x86/ac3dsp.asm 4 additions, 2 deletionslibavcodec/x86/ac3dsp.asm
- libavcodec/x86/h264_weight_10bit.asm 4 additions, 4 deletionslibavcodec/x86/h264_weight_10bit.asm
- libavformat/matroskadec.c 7 additions, 6 deletionslibavformat/matroskadec.c
- libavformat/movenc.c 1 addition, 1 deletionlibavformat/movenc.c
- libavutil/Makefile 0 additions, 3 deletionslibavutil/Makefile
- libavutil/ppc/Makefile 1 addition, 0 deletionslibavutil/ppc/Makefile
- libavutil/x86/Makefile 1 addition, 0 deletionslibavutil/x86/Makefile
- libswscale/Makefile 0 additions, 18 deletionslibswscale/Makefile
- libswscale/bfin/Makefile 3 additions, 0 deletionslibswscale/bfin/Makefile
- libswscale/ppc/Makefile 3 additions, 0 deletionslibswscale/ppc/Makefile
- libswscale/sparc/Makefile 1 addition, 0 deletionslibswscale/sparc/Makefile
- libswscale/swscale.c 282 additions, 242 deletionslibswscale/swscale.c
- libswscale/swscale_internal.h 4 additions, 4 deletionslibswscale/swscale_internal.h
- libswscale/utils.c 831 additions, 670 deletionslibswscale/utils.c
- libswscale/x86/Makefile 11 additions, 0 deletionslibswscale/x86/Makefile
Loading
Please register or sign in to comment