diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 22:23:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 22:23:04 +0100 |
| commit | 672c610d8439ec7e83ba1e1d0c5ca2388cfccfc3 (patch) | |
| tree | 17a5bca7fe47fa6729fc3ec48cf9dee3ba37faa8 /libavcodec/indeo4data.h | |
| parent | d6d3cfb0aa23c1f6111f71889256874d86c2cf77 (diff) | |
| parent | f9279ee74936b4990fc46287c27816ef828cc06c (diff) | |
| download | ffmpeg-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/indeo4data.h')
| -rw-r--r-- | libavcodec/indeo4data.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/indeo4data.h b/libavcodec/indeo4data.h index 0ea4f405ad..d96ee98502 100644 --- a/libavcodec/indeo4data.h +++ b/libavcodec/indeo4data.h @@ -28,8 +28,9 @@ #define AVCODEC_INDEO4DATA_H #include <stdint.h> -#include "dsputil.h" + #include "ivi_common.h" +#include "mathops.h" /** * standard picture dimensions |