diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-30 20:39:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-30 20:39:08 +0200 |
| commit | 98263d751562e3b8cefa6d06eb95f0dee8a205db (patch) | |
| tree | 3ad247f5591a06a9967b362b7dcd0d3e6e7dc6e6 /libavcodec/indeo4data.h | |
| parent | f5c7531ab1e69210df69b07ac6b21cb675f13b9e (diff) | |
| parent | 23944d29a22a2cd602753b3705f73011c3bf0b18 (diff) | |
| download | ffmpeg-98263d751562e3b8cefa6d06eb95f0dee8a205db.tar.gz | |
Merge commit '23944d29a22a2cd602753b3705f73011c3bf0b18'
* commit '23944d29a22a2cd602753b3705f73011c3bf0b18':
indeo: Give Indeo4/5 shared code a more consistent name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo4data.h')
| -rw-r--r-- | libavcodec/indeo4data.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/indeo4data.h b/libavcodec/indeo4data.h index efc5a6597e..cc497c2391 100644 --- a/libavcodec/indeo4data.h +++ b/libavcodec/indeo4data.h @@ -29,8 +29,7 @@ #include <stdint.h> -#include "ivi_common.h" -#include "mathops.h" +#include "ivi.h" /** * standard picture dimensions |