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>

diff --cc libavcodec/Makefile
Simple merge

diff --cc libavcodec/avcodec.h
index 7a7400d,450a9ca..cd933fd
--- 1/libavcodec/avcodec.h
--- 2/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@@ -261,20 -259,7 +261,20 @@@ enum CodecID 
      CODEC_ID_MSA1,
      CODEC_ID_TSCC2,
      CODEC_ID_MTS2,
-     CODEC_ID_CLLC       = MKBETAG('C','L','L','C'),
+     CODEC_ID_CLLC,
 +    CODEC_ID_Y41P       = MKBETAG('Y','4','1','P'),
 +    CODEC_ID_ESCAPE130  = MKBETAG('E','1','3','0'),
 +    CODEC_ID_EXR        = MKBETAG('0','E','X','R'),
 +    CODEC_ID_AVRP       = MKBETAG('A','V','R','P'),
 +
 +    CODEC_ID_G2M        = MKBETAG( 0 ,'G','2','M'),
 +    CODEC_ID_AVUI       = MKBETAG('A','V','U','I'),
 +    CODEC_ID_AYUV       = MKBETAG('A','Y','U','V'),
 +    CODEC_ID_V308       = MKBETAG('V','3','0','8'),
 +    CODEC_ID_V408       = MKBETAG('V','4','0','8'),
 +    CODEC_ID_YUV4       = MKBETAG('Y','U','V','4'),
 +    CODEC_ID_SANM       = MKBETAG('S','A','N','M'),
 +    CODEC_ID_PAF_VIDEO  = MKBETAG('P','A','F','V'),
  
      /* various PCM "codecs" */
      CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs

diff --cc libavcodec/vc1dec.c
index f5fbe54,e36cc0d..55d695b
--- 1/libavcodec/vc1dec.c
--- 2/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@@ -36,10 -36,8 +36,9 @@@
  #include "vc1acdata.h"
  #include "msmpeg4data.h"
  #include "unary.h"
- #include "simple_idct.h"
  #include "mathops.h"
  #include "vdpau_internal.h"
 +#include "libavutil/avassert.h"
  
  #undef NDEBUG
  #include <assert.h>

diff --cc libavcodec/version.h
index 48096ec,24e64e9..cb26975
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -27,8 -27,8 +27,8 @@@
   */
  
  #define LIBAVCODEC_VERSION_MAJOR 54
- #define LIBAVCODEC_VERSION_MINOR 47
 -#define LIBAVCODEC_VERSION_MINOR 24
 -#define LIBAVCODEC_VERSION_MICRO  0
++#define LIBAVCODEC_VERSION_MINOR 48
 +#define LIBAVCODEC_VERSION_MICRO 100
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \

diff --cc libavcodec/vp8.h
Simple merge

diff --cc libavcodec/x86/fft_mmx.asm
Simple merge

diff --cc libavformat/rtmppkt.c
Simple merge

diff --cc libavformat/rtmppkt.h
Simple merge