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/truemotion2.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/truemotion2.c')
| -rw-r--r-- | libavcodec/truemotion2.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index c3c2701ee5..18d7c1e685 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -27,9 +27,9 @@ #include <inttypes.h> #include "avcodec.h" +#include "bswapdsp.h" #include "bytestream.h" #include "get_bits.h" -#include "dsputil.h" #include "internal.h" #define TM2_ESCAPE 0x80000000 @@ -63,7 +63,7 @@ typedef struct TM2Context { AVFrame *pic; GetBitContext gb; - DSPContext dsp; + BswapDSPContext bdsp; uint8_t *buffer; int buffer_size; @@ -889,7 +889,8 @@ static int decode_frame(AVCodecContext *avctx, if ((ret = ff_reget_buffer(avctx, p)) < 0) return ret; - l->dsp.bswap_buf((uint32_t*)l->buffer, (const uint32_t*)buf, buf_size >> 2); + l->bdsp.bswap_buf((uint32_t *) l->buffer, (const uint32_t *) buf, + buf_size >> 2); if ((ret = tm2_read_header(l, l->buffer)) < 0) { return ret; @@ -940,7 +941,7 @@ static av_cold int decode_init(AVCodecContext *avctx) if (!l->pic) return AVERROR(ENOMEM); - ff_dsputil_init(&l->dsp, avctx); + ff_bswapdsp_init(&l->bdsp); l->last = av_malloc_array(w >> 2, 4 * sizeof(*l->last) ); l->clast = av_malloc_array(w >> 2, 4 * sizeof(*l->clast)); |