Michael Niedermayer
ebd99ff112
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>
2013-05-01 18:02:36 +02:00
Diego Biurrun
a053dbfcfb
ppc: Move AltiVec utility headers out of AltiVec ifdefs
...
Now that the headers themselves have ifdef protection this is no
longer necessary and more consistent with normal include handling.
2013-04-30 12:19:44 +02:00
Michael Niedermayer
2d23493020
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
ppc: hpeldsp: Include attributes.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-21 09:54:02 +02:00
Martin Storsjö
6d0fbebf94
ppc: hpeldsp: Include attributes.h
...
This fixes building in configurations where altivec is disabled.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-20 16:43:01 +03:00
Michael Niedermayer
055e5c8e01
Merge commit '47e5a98174eb9c07ad17be71df129719d60ec8b7'
...
* commit '47e5a98174eb9c07ad17be71df129719d60ec8b7':
ppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/hpeldsp.h
libavcodec/ppc/hpeldsp_altivec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 13:52:58 +02:00
Ronald S. Bultje
47e5a98174
ppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-19 23:18:59 +03:00
Ronald S. Bultje
89f16ded9b
Move ppc half-pel assembly from dsputil to hpeldsp.
2013-03-13 04:02:30 +01:00
