diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-26 04:52:29 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-26 05:23:56 +0400 |
commit | 3c5fe5b52758225e58fec917cc29281d6025aa67 (patch) | |
tree | d7484edfa989ffc33744cbbf11960e803f677f2b /libswscale | |
parent | 01e5e97026cf0b344abafca22b0336a2c58b2a33 (diff) | |
parent | d78bb1a4b2a3a415b68e4e6dd448779eccec64e3 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
wma: Clip WMA1 and WMA2 frame length to 11 bits.
movenc: Don't require frame_size to be set for modes other than mov
doc: Update APIchanges with info on muxer flushing
movenc: Reindent a block
tools: Remove some unnecessary #undefs.
rv20: prevent calling ff_h263_decode_mba() with unset height/width
tools: K&R reformatting cosmetics
Ignore generated aviocat and ismindex tools.
build: Automatically include architecture-specific library Makefile snippets.
indeo5: prevent null pointer dereference on broken files
pktdumper: Use usleep instead of sleep
cosmetics: Remove some unnecessary block braces.
Drop unnecessary prefix from *sink* variable and struct names.
Add a tool for creating smooth streaming manifests
movdec: Calculate an average bit rate for fragmented streams, too
movenc: Write the sample rate instead of time scale in the stsd atom
movenc: Add a separate ismv/isma (smooth streaming) muxer
movenc: Allow the caller to decide on fragmentation
libavformat: Add a flag for muxers that support write_packet(NULL) for flushing
movenc: Add support for writing fragmented mov files
...
Conflicts:
Changelog
cmdutils.c
cmdutils.h
doc/APIchanges
ffmpeg.c
ffplay.c
libavfilter/Makefile
libavformat/Makefile
libavformat/avformat.h
libavformat/movenc.c
libavformat/movenc.h
libavformat/version.h
tools/graph2dot.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
-rw-r--r-- | libswscale/ppc/swscale_altivec.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libswscale/ppc/swscale_altivec.c b/libswscale/ppc/swscale_altivec.c index f2a8600925..f8f109e72d 100644 --- a/libswscale/ppc/swscale_altivec.c +++ b/libswscale/ppc/swscale_altivec.c @@ -99,7 +99,6 @@ yuv2planeX_altivec(const int16_t *filter, int filterSize, const uint8_t *dither, int offset) { register int i, j; - { DECLARE_ALIGNED(16, int, val)[dstW]; for (i=0; i<dstW; i++) @@ -142,7 +141,6 @@ yuv2planeX_altivec(const int16_t *filter, int filterSize, } } altivec_packIntArrayToCharArray(val, dest, dstW); - } } static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW, @@ -166,7 +164,6 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW, else switch (filterSize) { case 4: - { for (i=0; i<dstW; i++) { register int srcPos = filterPos[i]; @@ -201,11 +198,9 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW, vec_st(val_s, 0, tempo); dst[i] = FFMIN(tempo[3]>>7, (1<<15)-1); } - } break; case 8: - { for (i=0; i<dstW; i++) { register int srcPos = filterPos[i]; @@ -228,11 +223,9 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW, vec_st(val_s, 0, tempo); dst[i] = FFMIN(tempo[3]>>7, (1<<15)-1); } - } break; case 16: - { for (i=0; i<dstW; i++) { register int srcPos = filterPos[i]; @@ -257,11 +250,9 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW, vec_st(val_s, 0, tempo); dst[i] = FFMIN(tempo[3]>>7, (1<<15)-1); } - } break; default: - { for (i=0; i<dstW; i++) { register int j; register int srcPos = filterPos[i]; @@ -321,7 +312,6 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW, } } - } } void ff_sws_init_swScale_altivec(SwsContext *c) |