diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 14:33:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 14:33:57 +0100 |
| commit | 6b2e65078c02cb1e09b555603a1eb10ddb3bd244 (patch) | |
| tree | 380272a56318a4153fce51926e1104de55fd262f /libavcodec/dvdec.c | |
| parent | 276c9c0577e99c870d4d281bc8f0df82b402efc4 (diff) | |
| parent | 218aefce4472dc02ee3f12830a9a894bf7916da9 (diff) | |
| download | ffmpeg-6b2e65078c02cb1e09b555603a1eb10ddb3bd244.tar.gz | |
Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'
* commit '218aefce4472dc02ee3f12830a9a894bf7916da9':
dsputil: Move LOCAL_ALIGNED macros to libavutil
Conflicts:
libavcodec/dvdec.c
libavcodec/imc.c
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvdec.c')
| -rw-r--r-- | libavcodec/dvdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index bb60fc0b13..64d2259a7b 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -36,9 +36,9 @@ */ #include "libavutil/avassert.h" +#include "libavutil/internal.h" #include "libavutil/pixdesc.h" #include "avcodec.h" -#include "dsputil.h" #include "internal.h" #include "get_bits.h" #include "put_bits.h" |