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/rv34.c | |
| parent | 276c9c0577e99c870d4d281bc8f0df82b402efc4 (diff) | |
| parent | 218aefce4472dc02ee3f12830a9a894bf7916da9 (diff) | |
| download | ffmpeg-streaming-6b2e65078c02cb1e09b555603a1eb10ddb3bd244.zip ffmpeg-streaming-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/rv34.c')
| -rw-r--r-- | libavcodec/rv34.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index eb431ee..a2f074e 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -28,7 +28,6 @@ #include "libavutil/internal.h" #include "avcodec.h" -#include "dsputil.h" #include "mpegvideo.h" #include "golomb.h" #include "internal.h" |
