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>

libavutil/random_seed.c

@@ -20,10 +20,10 @@
 
 #include <unistd.h>
 #include <fcntl.h>
+#include <math.h>
+#include <time.h>
 #include "timer.h"
-#include "time.h"
 #include "random_seed.h"
-#include "avutil.h"
 
 static int read_random(uint32_t *dst, const char *file)
 {