diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 11:53:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 11:53:05 +0200 |
| commit | 45a73d2b472ffcc0d87f3efae3424c44976d6935 (patch) | |
| tree | 454bf430eab79d20b8a7c4ac609ee70260188a16 /libswscale/ppc | |
| parent | 7cb5467a52011d194289035b51e27c4df80bf2a2 (diff) | |
| parent | c011ceef78eae66039efc66d9551a7146e08838a (diff) | |
| download | ffmpeg-45a73d2b472ffcc0d87f3efae3424c44976d6935.tar.gz | |
Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a'
* commit 'c011ceef78eae66039efc66d9551a7146e08838a':
swscale: ppc: Remove commented-out define cruft
nsvdec: Remove commented-out debug cruft
cpu: Restructure code to avoid pointless ret variable indirection
Conflicts:
libavutil/cpu.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/ppc')
| -rw-r--r-- | libswscale/ppc/yuv2rgb_altivec.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c index a2fc884b28..b0661f8a56 100644 --- a/libswscale/ppc/yuv2rgb_altivec.c +++ b/libswscale/ppc/yuv2rgb_altivec.c @@ -246,8 +246,6 @@ static const vector unsigned char (vector unsigned short) \ vec_max(y, ((vector signed short) { 0 }))) -//#define out_pixels(a, b, c, ptr) vec_mstrgb32(__typeof__(a), ((__typeof__(a)) { 255 }), a, a, a, ptr) - static inline void cvtyuvtoRGB(SwsContext *c, vector signed short Y, vector signed short U, vector signed short V, vector signed short *R, vector signed short *G, |