summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/webp/dec/alpha.c2
-rw-r--r--drivers/webp/dec/vp8li.h2
-rw-r--r--drivers/webp/dsp/dsp.h2
-rw-r--r--drivers/webp/dsp/lossless.h4
-rw-r--r--drivers/webp/enc/alpha.c2
-rw-r--r--drivers/webp/enc/backward_references.h4
-rw-r--r--drivers/webp/enc/config.c2
-rw-r--r--drivers/webp/enc/histogram.h4
-rw-r--r--drivers/webp/enc/syntax.c2
-rw-r--r--drivers/webp/enc/vp8enci.h2
-rw-r--r--drivers/webp/enc/vp8l.c2
-rw-r--r--drivers/webp/enc/vp8li.h4
-rw-r--r--drivers/webp/utils/bit_reader.h2
-rw-r--r--drivers/webp/utils/bit_writer.h2
-rw-r--r--drivers/webp/utils/color_cache.h2
-rw-r--r--drivers/webp/utils/filters.h2
-rw-r--r--drivers/webp/utils/huffman.c2
-rw-r--r--drivers/webp/utils/huffman.h2
-rw-r--r--drivers/webp/utils/huffman_encode.c2
-rw-r--r--drivers/webp/utils/huffman_encode.h2
-rw-r--r--drivers/webp/utils/quant_levels.h2
-rw-r--r--drivers/webp/utils/rescaler.h2
-rw-r--r--drivers/webp/utils/utils.h2
23 files changed, 27 insertions, 27 deletions
diff --git a/drivers/webp/dec/alpha.c b/drivers/webp/dec/alpha.c
index 6e65de9030..d1095fa555 100644
--- a/drivers/webp/dec/alpha.c
+++ b/drivers/webp/dec/alpha.c
@@ -14,7 +14,7 @@
#include "./vp8li.h"
#include "../utils/filters.h"
#include "../utils/quant_levels.h"
-#include "../webp/format_constants.h"
+#include "../format_constants.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
diff --git a/drivers/webp/dec/vp8li.h b/drivers/webp/dec/vp8li.h
index ee29eb5faf..5f6cd6a01c 100644
--- a/drivers/webp/dec/vp8li.h
+++ b/drivers/webp/dec/vp8li.h
@@ -18,7 +18,7 @@
#include "../utils/bit_reader.h"
#include "../utils/color_cache.h"
#include "../utils/huffman.h"
-#include "../webp/format_constants.h"
+#include "../format_constants.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
diff --git a/drivers/webp/dsp/dsp.h b/drivers/webp/dsp/dsp.h
index 042c98aad2..9ff53174d4 100644
--- a/drivers/webp/dsp/dsp.h
+++ b/drivers/webp/dsp/dsp.h
@@ -12,7 +12,7 @@
#ifndef WEBP_DSP_DSP_H_
#define WEBP_DSP_DSP_H_
-#include "../webp/types.h"
+#include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
diff --git a/drivers/webp/dsp/lossless.h b/drivers/webp/dsp/lossless.h
index 992516fcdf..7c7d5555ed 100644
--- a/drivers/webp/dsp/lossless.h
+++ b/drivers/webp/dsp/lossless.h
@@ -13,8 +13,8 @@
#ifndef WEBP_DSP_LOSSLESS_H_
#define WEBP_DSP_LOSSLESS_H_
-#include "../webp/types.h"
-#include "../webp/decode.h"
+#include "../types.h"
+#include "../decode.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
diff --git a/drivers/webp/enc/alpha.c b/drivers/webp/enc/alpha.c
index 0e519b6c66..e554eb7f30 100644
--- a/drivers/webp/enc/alpha.c
+++ b/drivers/webp/enc/alpha.c
@@ -15,7 +15,7 @@
#include "./vp8enci.h"
#include "../utils/filters.h"
#include "../utils/quant_levels.h"
-#include "../webp/format_constants.h"
+#include "../format_constants.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
diff --git a/drivers/webp/enc/backward_references.h b/drivers/webp/enc/backward_references.h
index 91c03361ed..8006a56ba1 100644
--- a/drivers/webp/enc/backward_references.h
+++ b/drivers/webp/enc/backward_references.h
@@ -13,8 +13,8 @@
#include <assert.h>
#include <stdlib.h>
-#include "../webp/types.h"
-#include "../webp/format_constants.h"
+#include "../types.h"
+#include "../format_constants.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
diff --git a/drivers/webp/enc/config.c b/drivers/webp/enc/config.c
index 1a26113554..4136f6c227 100644
--- a/drivers/webp/enc/config.c
+++ b/drivers/webp/enc/config.c
@@ -9,7 +9,7 @@
//
// Author: Skal (pascal.massimino@gmail.com)
-#include "../webp/encode.h"
+#include "../encode.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
diff --git a/drivers/webp/enc/histogram.h b/drivers/webp/enc/histogram.h
index ec573c5c85..5b5de25539 100644
--- a/drivers/webp/enc/histogram.h
+++ b/drivers/webp/enc/histogram.h
@@ -19,8 +19,8 @@
#include <string.h>
#include "./backward_references.h"
-#include "../webp/format_constants.h"
-#include "../webp/types.h"
+#include "../format_constants.h"
+#include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
diff --git a/drivers/webp/enc/syntax.c b/drivers/webp/enc/syntax.c
index 7c8c7b1a84..4221436ff9 100644
--- a/drivers/webp/enc/syntax.c
+++ b/drivers/webp/enc/syntax.c
@@ -11,7 +11,7 @@
#include <assert.h>
-#include "../webp/format_constants.h"
+#include "../format_constants.h"
#include "./vp8enci.h"
#if defined(__cplusplus) || defined(c_plusplus)
diff --git a/drivers/webp/enc/vp8enci.h b/drivers/webp/enc/vp8enci.h
index a77778c0d8..936e1c18ce 100644
--- a/drivers/webp/enc/vp8enci.h
+++ b/drivers/webp/enc/vp8enci.h
@@ -13,7 +13,7 @@
#define WEBP_ENC_VP8ENCI_H_
#include <string.h> // for memcpy()
-#include "../webp/encode.h"
+#include "../encode.h"
#include "../dsp/dsp.h"
#include "../utils/bit_writer.h"
diff --git a/drivers/webp/enc/vp8l.c b/drivers/webp/enc/vp8l.c
index 9c202f8d36..f4eb6e783f 100644
--- a/drivers/webp/enc/vp8l.c
+++ b/drivers/webp/enc/vp8l.c
@@ -21,7 +21,7 @@
#include "../utils/bit_writer.h"
#include "../utils/huffman_encode.h"
#include "../utils/utils.h"
-#include "../webp/format_constants.h"
+#include "../format_constants.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
diff --git a/drivers/webp/enc/vp8li.h b/drivers/webp/enc/vp8li.h
index eae90dd61f..bb111aec33 100644
--- a/drivers/webp/enc/vp8li.h
+++ b/drivers/webp/enc/vp8li.h
@@ -14,8 +14,8 @@
#include "./histogram.h"
#include "../utils/bit_writer.h"
-#include "../webp/encode.h"
-#include "../webp/format_constants.h"
+#include "../encode.h"
+#include "../format_constants.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
diff --git a/drivers/webp/utils/bit_reader.h b/drivers/webp/utils/bit_reader.h
index 36fc13e2da..d80b497149 100644
--- a/drivers/webp/utils/bit_reader.h
+++ b/drivers/webp/utils/bit_reader.h
@@ -18,7 +18,7 @@
#include <stdlib.h> // _byteswap_ulong
#endif
#include <string.h> // For memcpy
-#include "../webp/types.h"
+#include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
diff --git a/drivers/webp/utils/bit_writer.h b/drivers/webp/utils/bit_writer.h
index f7ca08497f..57f39b11b1 100644
--- a/drivers/webp/utils/bit_writer.h
+++ b/drivers/webp/utils/bit_writer.h
@@ -12,7 +12,7 @@
#ifndef WEBP_UTILS_BIT_WRITER_H_
#define WEBP_UTILS_BIT_WRITER_H_
-#include "../webp/types.h"
+#include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
diff --git a/drivers/webp/utils/color_cache.h b/drivers/webp/utils/color_cache.h
index 13be629f36..da5e260195 100644
--- a/drivers/webp/utils/color_cache.h
+++ b/drivers/webp/utils/color_cache.h
@@ -13,7 +13,7 @@
#ifndef WEBP_UTILS_COLOR_CACHE_H_
#define WEBP_UTILS_COLOR_CACHE_H_
-#include "../webp/types.h"
+#include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
diff --git a/drivers/webp/utils/filters.h b/drivers/webp/utils/filters.h
index c5cdbd6deb..db886be29a 100644
--- a/drivers/webp/utils/filters.h
+++ b/drivers/webp/utils/filters.h
@@ -12,7 +12,7 @@
#ifndef WEBP_UTILS_FILTERS_H_
#define WEBP_UTILS_FILTERS_H_
-#include "../webp/types.h"
+#include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
diff --git a/drivers/webp/utils/huffman.c b/drivers/webp/utils/huffman.c
index 41529cc9da..1cc1cfd355 100644
--- a/drivers/webp/utils/huffman.c
+++ b/drivers/webp/utils/huffman.c
@@ -13,7 +13,7 @@
#include <stdlib.h>
#include "./huffman.h"
#include "../utils/utils.h"
-#include "../webp/format_constants.h"
+#include "../format_constants.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
diff --git a/drivers/webp/utils/huffman.h b/drivers/webp/utils/huffman.h
index 70220a67fb..f16447e649 100644
--- a/drivers/webp/utils/huffman.h
+++ b/drivers/webp/utils/huffman.h
@@ -13,7 +13,7 @@
#define WEBP_UTILS_HUFFMAN_H_
#include <assert.h>
-#include "../webp/types.h"
+#include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
diff --git a/drivers/webp/utils/huffman_encode.c b/drivers/webp/utils/huffman_encode.c
index 8ccd291d22..e172b10a85 100644
--- a/drivers/webp/utils/huffman_encode.c
+++ b/drivers/webp/utils/huffman_encode.c
@@ -14,7 +14,7 @@
#include <string.h>
#include "./huffman_encode.h"
#include "../utils/utils.h"
-#include "../webp/format_constants.h"
+#include "../format_constants.h"
// -----------------------------------------------------------------------------
// Util function to optimize the symbol map for RLE coding
diff --git a/drivers/webp/utils/huffman_encode.h b/drivers/webp/utils/huffman_encode.h
index cc3b38d330..7f4aedc102 100644
--- a/drivers/webp/utils/huffman_encode.h
+++ b/drivers/webp/utils/huffman_encode.h
@@ -12,7 +12,7 @@
#ifndef WEBP_UTILS_HUFFMAN_ENCODE_H_
#define WEBP_UTILS_HUFFMAN_ENCODE_H_
-#include "../webp/types.h"
+#include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
diff --git a/drivers/webp/utils/quant_levels.h b/drivers/webp/utils/quant_levels.h
index 89ccafe40d..4f165fd230 100644
--- a/drivers/webp/utils/quant_levels.h
+++ b/drivers/webp/utils/quant_levels.h
@@ -14,7 +14,7 @@
#include <stdlib.h>
-#include "../webp/types.h"
+#include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
diff --git a/drivers/webp/utils/rescaler.h b/drivers/webp/utils/rescaler.h
index ef93d465f0..9c9133d19b 100644
--- a/drivers/webp/utils/rescaler.h
+++ b/drivers/webp/utils/rescaler.h
@@ -16,7 +16,7 @@
extern "C" {
#endif
-#include "../webp/types.h"
+#include "../types.h"
// Structure used for on-the-fly rescaling
typedef struct {
diff --git a/drivers/webp/utils/utils.h b/drivers/webp/utils/utils.h
index a034762556..316ac90612 100644
--- a/drivers/webp/utils/utils.h
+++ b/drivers/webp/utils/utils.h
@@ -12,7 +12,7 @@
#ifndef WEBP_UTILS_UTILS_H_
#define WEBP_UTILS_UTILS_H_
-#include "../webp/types.h"
+#include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {