diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 17:33:57 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 17:33:57 +0400 |
commit | 6b2e65078c02cb1e09b555603a1eb10ddb3bd244 (patch) | |
tree | 380272a56318a4153fce51926e1104de55fd262f /libavcodec/mpegvideo_motion.c | |
parent | 276c9c0577e99c870d4d281bc8f0df82b402efc4 (diff) | |
parent | 218aefce4472dc02ee3f12830a9a894bf7916da9 (diff) |
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/mpegvideo_motion.c')
-rw-r--r-- | libavcodec/mpegvideo_motion.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c index 22381dea27..565f6cb286 100644 --- a/libavcodec/mpegvideo_motion.c +++ b/libavcodec/mpegvideo_motion.c @@ -22,7 +22,9 @@ */ #include <string.h> + #include "libavutil/avassert.h" +#include "libavutil/internal.h" #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" |