• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · e776ee8f
    Michael Niedermayer authored
    * qatar/master:
      lavr: fix handling of custom mix matrices
      fate: force pix_fmt in lagarith-rgb32 test
      fate: add tests for lagarith lossless video codec.
      ARMv6: vp8: fix stack allocation with Apple's assembler
      ARM: vp56: allow inline asm to build with clang
      fft: 3dnow: fix register name typo in DECL_IMDCT macro
      x86: dct32: port to cpuflags
      x86: build: replace mmx2 by mmxext
      Revert "wmapro: prevent division by zero when sample rate is unspecified"
      wmapro: prevent division by zero when sample rate is unspecified
      lagarith: fix color plane inversion for YUY2 output.
      lagarith: pad RGB buffer by 1 byte.
      dsputil: make add_hfyu_left_prediction_sse4() support unaligned src.
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/lagarith.c
    	libavfilter/x86/gradfun.c
    	libavutil/cpu.h
    	libavutil/version.h
    	libswscale/utils.c
    	libswscale/version.h
    	libswscale/x86/yuv2rgb.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e776ee8f
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.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...
filter_design.txt 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...
metadata.texi Loading commit data...
mips.txt 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...
syntax.texi Loading commit data...
t2h.init Loading commit data...
tablegen.txt Loading commit data...
texi2pod.pl Loading commit data...
viterbi.txt Loading commit data...