diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:02:36 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:02:36 +0200 |
commit | ebd99ff112e8993330dd39959c22dfe1ab17d5c0 (patch) | |
tree | d3d9c3e9aa718b0621f13644d0867490d4aee992 /libavcodec/motion_est.c | |
parent | 148f69eb4e4ce63b911a53bcb883b77b364f13bd (diff) | |
parent | 42b9150b0d4f0a130c1d93dc991fd5412743a8cf (diff) | |
download | ffmpeg-ebd99ff112e8993330dd39959c22dfe1ab17d5c0.tar.gz |
Merge commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf'
* commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf':
fft: Remove pointless #ifdefs around function declarations
ppc: Move AltiVec utility headers out of AltiVec ifdefs
Conflicts:
libavcodec/fft.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/motion_est.c')
0 files changed, 0 insertions, 0 deletions