[FFmpeg-devel] [misc-filters PATCH 4/5] Move colorspace.h from lavc to lavu. Avoid a compile-dependancy of the pad filter on lavc.

[Stefano Sabatini]

---
 ffmpeg.c                               |    2 +-
 ffplay.c                               |    2 +-
 libavcodec/dvbsub.c                    |    2 +-
 libavcodec/dvbsubdec.c                 |    2 +-
 libavcodec/dvdsubdec.c                 |    2 +-
 libavcodec/imgconvert.c                |    2 +-
 libavcodec/pgssubdec.c                 |    2 +-
 libavfilter/vf_pad.c                   |    2 +-
 {libavcodec => libavutil}/colorspace.h |    6 +++---
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename {libavcodec => libavutil}/colorspace.h (97%)

diff --git a/ffmpeg.c b/ffmpeg.c
index cb6ef42..d059a7a 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -36,7 +36,7 @@
 #include "libswscale/swscale.h"
 #include "libavcodec/opt.h"
 #include "libavcodec/audioconvert.h"
-#include "libavcodec/colorspace.h"
+#include "libavutil/colorspace.h"
 #include "libavutil/fifo.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/avstring.h"
diff --git a/ffplay.c b/ffplay.c
index 129cd28..6615abb 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -24,12 +24,12 @@
 #include <math.h>
 #include <limits.h>
 #include "libavutil/avstring.h"
+#include "libavutil/colorspace.h"
 #include "libavutil/pixdesc.h"
 #include "libavformat/avformat.h"
 #include "libavdevice/avdevice.h"
 #include "libswscale/swscale.h"
 #include "libavcodec/audioconvert.h"
-#include "libavcodec/colorspace.h"
 #include "libavcodec/opt.h"
 #include "libavcodec/avfft.h"
 
diff --git a/libavcodec/dvbsub.c b/libavcodec/dvbsub.c
index 0f09826..ea55cae 100644
--- a/libavcodec/dvbsub.c
+++ b/libavcodec/dvbsub.c
@@ -20,7 +20,7 @@
  */
 #include "avcodec.h"
 #include "bytestream.h"
-#include "colorspace.h"
+#include "libavutil/colorspace.h"
 
 typedef struct DVBSubtitleContext {
     int hide_state;
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c
index a815056..ebe17e0 100644
--- a/libavcodec/dvbsubdec.c
+++ b/libavcodec/dvbsubdec.c
@@ -21,7 +21,7 @@
 #include "avcodec.h"
 #include "dsputil.h"
 #include "get_bits.h"
-#include "colorspace.h"
+#include "libavutil/colorspace.h"
 #include "bytestream.h"
 
 //#define DEBUG
diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index 75b5256..601b090 100644
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@@ -20,7 +20,7 @@
  */
 #include "avcodec.h"
 #include "get_bits.h"
-#include "colorspace.h"
+#include "libavutil/colorspace.h"
 #include "dsputil.h"
 
 //#define DEBUG
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 4984f2c..68f1a75 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -32,9 +32,9 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "colorspace.h"
 #include "internal.h"
 #include "imgconvert.h"
+#include "libavutil/colorspace.h"
 #include "libavutil/pixdesc.h"
 
 #if HAVE_MMX
diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c
index 5512006..06a6214 100644
--- a/libavcodec/pgssubdec.c
+++ b/libavcodec/pgssubdec.c
@@ -26,8 +26,8 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "colorspace.h"
 #include "bytestream.h"
+#include "libavutil/colorspace.h"
 
 //#define DEBUG_PACKET_CONTENTS
 
diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c
index 084ed58..b417aef 100644
--- a/libavfilter/vf_pad.c
+++ b/libavfilter/vf_pad.c
@@ -27,7 +27,7 @@
 #include "avfilter.h"
 #include "parseutils.h"
 #include "libavutil/pixdesc.h"
-#include "libavcodec/colorspace.h"
+#include "libavutil/colorspace.h"
 
 static void draw_rectangle(AVFilterPicRef *outpic, uint8_t *line[4], int line_step[4],
                            int hsub, int vsub, int x, int y, int w, int h)
diff --git a/libavcodec/colorspace.h b/libavutil/colorspace.h
similarity index 97%
rename from libavcodec/colorspace.h
rename to libavutil/colorspace.h
index 4ec081e..f438159 100644
--- a/libavcodec/colorspace.h
+++ b/libavutil/colorspace.h
@@ -24,8 +24,8 @@
  * Various defines for YUV<->RGB conversion
  */
 
-#ifndef AVCODEC_COLORSPACE_H
-#define AVCODEC_COLORSPACE_H
+#ifndef AVUTIL_COLORSPACE_H
+#define AVUTIL_COLORSPACE_H
 
 #define SCALEBITS 10
 #define ONE_HALF  (1 << (SCALEBITS - 1))
@@ -108,4 +108,4 @@ static inline int C_JPEG_TO_CCIR(int y) {
 (((FIX(0.50000*224.0/255.0) * r1 - FIX(0.41869*224.0/255.0) * g1 -           \
    FIX(0.08131*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128)
 
-#endif /* AVCODEC_COLORSPACE_H */
+#endif /* AVUTIL_COLORSPACE_H */
-- 
1.7.1