diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 13:23:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 13:31:26 +0200 |
| commit | 35bb74900b951dccdc7481e98a00246f59ec2420 (patch) | |
| tree | 4e1545a104d5d0eb3194d84f9df6318841c39675 /libavcodec/dsputil.c | |
| parent | 56afbe8dbc6e508ba279bb95db542b940284fa7d (diff) | |
| parent | c67b449bebbe0b35c73b203683e77a0a649bc765 (diff) | |
| download | ffmpeg-35bb74900b951dccdc7481e98a00246f59ec2420.tar.gz | |
Merge commit 'c67b449bebbe0b35c73b203683e77a0a649bc765'
* commit 'c67b449bebbe0b35c73b203683e77a0a649bc765':
dsputil: Split bswap*_buf() off into a separate context
Conflicts:
configure
libavcodec/4xm.c
libavcodec/ac3dec.c
libavcodec/ac3dec.h
libavcodec/apedec.c
libavcodec/eamad.c
libavcodec/flacenc.c
libavcodec/fraps.c
libavcodec/huffyuv.c
libavcodec/huffyuvdec.c
libavcodec/motionpixels.c
libavcodec/truemotion2.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index ebd01bf8cc..89363aef77 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -190,30 +190,6 @@ static int pix_norm1_c(uint8_t *pix, int line_size) return s; } -static void bswap_buf(uint32_t *dst, const uint32_t *src, int w) -{ - int i; - - for (i = 0; i + 8 <= w; i += 8) { - dst[i + 0] = av_bswap32(src[i + 0]); - dst[i + 1] = av_bswap32(src[i + 1]); - dst[i + 2] = av_bswap32(src[i + 2]); - dst[i + 3] = av_bswap32(src[i + 3]); - dst[i + 4] = av_bswap32(src[i + 4]); - dst[i + 5] = av_bswap32(src[i + 5]); - dst[i + 6] = av_bswap32(src[i + 6]); - dst[i + 7] = av_bswap32(src[i + 7]); - } - for (; i < w; i++) - dst[i + 0] = av_bswap32(src[i + 0]); -} - -static void bswap16_buf(uint16_t *dst, const uint16_t *src, int len) -{ - while (len--) - *dst++ = av_bswap16(*src++); -} - static int sse4_c(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) { @@ -1574,9 +1550,6 @@ av_cold void ff_dsputil_init(DSPContext *c, AVCodecContext *avctx) ff_dsputil_init_dwt(c); #endif - c->bswap_buf = bswap_buf; - c->bswap16_buf = bswap16_buf; - c->try_8x8basis = try_8x8basis_c; c->add_8x8basis = add_8x8basis_c; |