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/utvideo.h | |
| parent | 56afbe8dbc6e508ba279bb95db542b940284fa7d (diff) | |
| parent | c67b449bebbe0b35c73b203683e77a0a649bc765 (diff) | |
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/utvideo.h')
| -rw-r--r-- | libavcodec/utvideo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/utvideo.h b/libavcodec/utvideo.h index e6217da450..78c3ec54dc 100644 --- a/libavcodec/utvideo.h +++ b/libavcodec/utvideo.h @@ -29,7 +29,7 @@ #include "libavutil/common.h" #include "avcodec.h" -#include "dsputil.h" +#include "bswapdsp.h" #include "huffyuvencdsp.h" enum { @@ -66,7 +66,7 @@ extern const int ff_ut_rgb_order[4]; typedef struct UtvideoContext { AVCodecContext *avctx; - DSPContext dsp; + BswapDSPContext bdsp; HuffYUVEncDSPContext hdsp; uint32_t frame_info_size, flags, frame_info; |