• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 367d9b29
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    367d9b29
Name
Last commit
Last update
doc Loading commit data...
ffpresets Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswresample Loading commit data...
libswscale Loading commit data...
mt-work Loading commit data...
presets Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
Doxyfile Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README Loading commit data...
RELEASE Loading commit data...
arch.mak Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
library.mak Loading commit data...
version.sh Loading commit data...