• 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
..
doxy Loading commit data...
examples Loading commit data...
APIchanges Loading commit data...
Makefile Loading commit data...
RELEASE_NOTES Loading commit data...
avtools-common-opts.texi Loading commit data...
avutil.txt Loading commit data...
bitstream_filters.texi Loading commit data...
build_system.txt Loading commit data...
decoders.texi Loading commit data...
demuxers.texi Loading commit data...
developer.texi Loading commit data...
encoders.texi Loading commit data...
errno.txt Loading commit data...
eval.texi Loading commit data...
faq.texi Loading commit data...
fate.texi Loading commit data...
ffmpeg-mt-authorship.txt Loading commit data...
ffmpeg.texi Loading commit data...
ffmpeg.txt Loading commit data...
ffplay.texi Loading commit data...
ffprobe.texi Loading commit data...
ffprobe.xsd Loading commit data...
ffserver.conf Loading commit data...
ffserver.texi Loading commit data...
filters.texi Loading commit data...
general.texi Loading commit data...
git-howto.texi Loading commit data...
git-howto.txt Loading commit data...
indevs.texi Loading commit data...
issue_tracker.txt Loading commit data...
libavfilter.texi Loading commit data...
metadata.texi Loading commit data...
multithreading.txt Loading commit data...
muxers.texi Loading commit data...
optimization.txt Loading commit data...
outdevs.texi Loading commit data...
platform.texi Loading commit data...
print_options.c Loading commit data...
protocols.texi Loading commit data...
rate_distortion.txt Loading commit data...
snow.txt Loading commit data...
soc.txt Loading commit data...
swresample.txt Loading commit data...
swscale.txt Loading commit data...
t2h.init Loading commit data...
tablegen.txt Loading commit data...
texi2pod.pl Loading commit data...
viterbi.txt Loading commit data...