• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 5c15b78e
    Michael Niedermayer authored
    * qatar/master: (42 commits)
      swscale: fix signed overflow in yuv2mono_X_c_template
      snow: fix integer overflows
      svq1enc: remove stale altivec-related hack
      snow: fix signed overflow in byte to 32-bit replication
      adx: rename ff_adx_decode_header() to avpriv_adx_decode_header()
      avformat: add CRI ADX format demuxer
      adx: add an ADX parser.
      adx: move header decoding to ADX common code
      adx: calculate the number of blocks in a packet
      adx: define and use 2 new macro constants BLOCK_SIZE and BLOCK_SAMPLES
      adx: check for unsupported ADX formats
      adx: simplify encoding by using put_sbits()
      adx: calculate correct LPC coeffs
      adx: use 12-bit coefficients instead of 14-bit to avoid integer overflow
      adx: simplify adx_decode() by using get_sbits() to read residual samples
      adx: fix the data offset parsing in adx_decode_header()
      adx: remove unneeded post-decode channel interleaving
      adx: validate header values
      adx: cosmetics: general pretty-printing and comment clean-up
      adx: remove useless comments
      ...
    
    Conflicts:
    	Changelog
    	libavcodec/cook.c
    	libavcodec/fraps.c
    	libavcodec/nuv.c
    	libavcodec/pthread.c
    	libavcodec/version.h
    	libavformat/Makefile
    	libavformat/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    5c15b78e
Name
Last commit
Last update
..
examples Loading commit data...
APIchanges Loading commit data...
Makefile Loading commit data...
RELEASE_NOTES Loading commit data...
avconv.texi 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...
eval.texi Loading commit data...
faq.texi Loading commit data...
fate.txt 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...
ffserver.conf Loading commit data...
ffserver.texi Loading commit data...
filters.texi Loading commit data...
general.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...
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...