Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
  dsputil: remove disabled code
  tta: remove disabled code
  gxfenc: place variable declarations before statements
  x86: Use LOCAL_ALIGNED in mpegvideo_mmx_template
  random_seed: use proper #includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/dsputil.c
Simple merge

diff --cc libavcodec/tta.c
Simple merge

diff --cc libavcodec/x86/dsputil_mmx.c
Simple merge

diff --cc libavcodec/x86/mpegvideo_mmx_template.c
Simple merge

diff --cc libavformat/gxfenc.c
Simple merge

diff --cc libavutil/random_seed.c
Simple merge