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/asv.c | |
| parent | 56afbe8dbc6e508ba279bb95db542b940284fa7d (diff) | |
| parent | c67b449bebbe0b35c73b203683e77a0a649bc765 (diff) | |
| download | ffmpeg-streaming-35bb74900b951dccdc7481e98a00246f59ec2420.zip ffmpeg-streaming-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/asv.c')
| -rw-r--r-- | libavcodec/asv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/asv.c b/libavcodec/asv.c index 58d2a89..c4f74ee 100644 --- a/libavcodec/asv.c +++ b/libavcodec/asv.c @@ -27,6 +27,7 @@ #include "asv.h" #include "avcodec.h" +#include "bswapdsp.h" const uint8_t ff_asv_scantab[64] = { 0x00,0x08,0x01,0x09,0x10,0x18,0x11,0x19, @@ -82,6 +83,7 @@ const uint8_t ff_asv2_level_tab[63][2] = { av_cold void ff_asv_common_init(AVCodecContext *avctx) { ASV1Context * const a = avctx->priv_data; + ff_bswapdsp_init(&a->bbdsp); ff_dsputil_init(&a->dsp, avctx); a->mb_width = (avctx->width + 15) / 16; |
