Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 2 Aug 2012 20:25:07 +0000 (22:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 2 Aug 2012 21:34:01 +0000 (23:34 +0200)
commit9c6e23f5d2f9fa58d54adf35b4cde4e351fb7d64
tree51e742dd00ad34c80a40e60e8fa4ff7a05adef8f
parent9f14cd91b5195e2beba7213e855c0d36b787ab85
parentc728518b3cbb0daf0d0a65ba7adfcb48c5629b93
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: fft: fix imdct_half() for AVX
  rtmppkt: Add missing libavcodec/bytestream.h include.
  rtmp: add functions for reading AMF values
  vc1dec: remove useless #include simple_idct.h
  dct-test: always link with aandcttab.o
  vp8: pack struct VP8ThreadData more efficiently
  x86: remove libmpeg2 mmx(ext) idct functions
  eamad: Use dsputils instead of a custom bswap16_buf
  Canopus Lossless decoder

Conflicts:
Changelog
LICENSE
libavcodec/avcodec.h
libavcodec/cllc.c
libavcodec/eamad.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/vc1dec.c
libavcodec/version.h
libavcodec/vp8.h
libavcodec/x86/fft_mmx.asm
libavformat/rtmppkt.c
libavformat/rtmppkt.h