OSDN Git Service

Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Jul 2011 14:43:35 +0000 (16:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Jul 2011 14:43:46 +0000 (16:43 +0200)
commit3c3daf4d198306295e3342631f19422bdc258dbb
tree96087928a24b17dbd893c7ab5dfa5f45a76de4ae
parent93263dc19e441f347baf9c36b5bc83693f16d084
parent9bc8bcddbd4fc394e2268e9849dcbf3bad6de980
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>
libavcodec/dsputil.c
libavcodec/tta.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/mpegvideo_mmx_template.c
libavformat/gxfenc.c
libavutil/random_seed.c