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/indeo4.c | |
| parent | f5c7531ab1e69210df69b07ac6b21cb675f13b9e (diff) | |
| parent | 23944d29a22a2cd602753b3705f73011c3bf0b18 (diff) | |
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/indeo4.c')
| -rw-r--r-- | libavcodec/indeo4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index ed4272bbe6..31088f9e0c 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -30,8 +30,8 @@ #define BITSTREAM_READER_LE #include "avcodec.h" #include "get_bits.h" +#include "ivi.h" #include "ivi_dsp.h" -#include "ivi_common.h" #include "indeo4data.h" #define IVI4_PIC_SIZE_ESC 7 |