aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vp3.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-22 22:23:04 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-22 22:23:04 +0100
commit672c610d8439ec7e83ba1e1d0c5ca2388cfccfc3 (patch)
tree17a5bca7fe47fa6729fc3ec48cf9dee3ba37faa8 /libavcodec/vp3.c
parentd6d3cfb0aa23c1f6111f71889256874d86c2cf77 (diff)
parentf9279ee74936b4990fc46287c27816ef828cc06c (diff)
downloadffmpeg-672c610d8439ec7e83ba1e1d0c5ca2388cfccfc3.tar.gz
Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'
* commit 'f9279ee74936b4990fc46287c27816ef828cc06c': dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h Conflicts: libavcodec/imgconvert.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp3.c')
-rw-r--r--libavcodec/vp3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 4988fbd33c..512e45905f 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -36,9 +36,9 @@
#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "internal.h"
-#include "dsputil.h"
#include "get_bits.h"
#include "hpeldsp.h"
+#include "mathops.h"
#include "videodsp.h"
#include "vp3data.h"
#include "vp3dsp.h"