diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 01:23:04 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 01:23:04 +0400 |
| commit | 672c610d8439ec7e83ba1e1d0c5ca2388cfccfc3 (patch) | |
| tree | 17a5bca7fe47fa6729fc3ec48cf9dee3ba37faa8 /libavcodec/imgconvert.c | |
| parent | d6d3cfb0aa23c1f6111f71889256874d86c2cf77 (diff) | |
| parent | f9279ee74936b4990fc46287c27816ef828cc06c (diff) | |
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/imgconvert.c')
| -rw-r--r-- | libavcodec/imgconvert.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 64510f3746..b830961fda 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -31,9 +31,9 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "imgconvert.h" #include "internal.h" +#include "mathops.h" #include "libavutil/avassert.h" #include "libavutil/colorspace.h" #include "libavutil/common.h" |