diff options
| author | Michael Niedermayer <[email protected]> | 2011-07-18 16:43:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2011-07-18 16:43:46 +0200 |
| commit | 3c3daf4d198306295e3342631f19422bdc258dbb (patch) | |
| tree | 96087928a24b17dbd893c7ab5dfa5f45a76de4ae /ffmpeg.c | |
| parent | 93263dc19e441f347baf9c36b5bc83693f16d084 (diff) | |
| parent | 9bc8bcddbd4fc394e2268e9849dcbf3bad6de980 (diff) | |
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 <[email protected]>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions