• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 2cb4d516
    Michael Niedermayer authored
    * qatar/master:
      v410dec: Implement explode mode support
      zerocodec: fix direct rendering.
      wav: init st to NULL to avoid a false-positive warning.
      wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit
      h264: refactor NAL decode loop
      RTMPTE protocol support
      RTMPE protocol support
      rtmp: Add ff_rtmp_calc_digest_pos()
      rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global
      swscale: add missing HAVE_INLINE_ASM check.
      lavfi: place x86 inline assembly under HAVE_INLINE_ASM.
      vc1: Add a test for interlaced field pictures
      swscale: Mark all init functions as av_cold
      swscale: x86: Drop pointless _mmx suffix from filenames
      lavf: use conditional notation for default codec in muxer declarations.
      swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM.
      dsputil: ppc: cosmetics: pretty-print
      dsputil: x86: add SHUFFLE_MASK_W macro
      configure: respect CC_O setting in check_cc
    
    Conflicts:
    	Changelog
    	configure
    	libavcodec/v410dec.c
    	libavcodec/zerocodec.c
    	libavformat/asfenc.c
    	libavformat/version.h
    	libswscale/utils.c
    	libswscale/x86/swscale.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2cb4d516
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...