Move colorspace.h from libavcodec to libavutil.

Avoid a compile-time dependency of the pad filter on libavcodec.

Originally committed as revision 23940 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 714dc0d40fdaf81de1a809486c40db5ece9503cf..e4b4b9eb95aad81edd6d3ee57fb33869f22fc3e2 100644 (file)
--- 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 e65226a45391fe9c13f540ad7e61d30cc226b9e4..a43dbb1e6f478126e542a04818745d1fd239ca59 100644 (file)
--- 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/avcodec.h b/libavcodec/avcodec.h
index 2eb2ff683e8112cbf75f4151ad2361500831864e..5841d6a4c80c54ff52e2024bd69df3b0392087af 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -31,7 +31,7 @@
 
 #define LIBAVCODEC_VERSION_MAJOR 52
 #define LIBAVCODEC_VERSION_MINOR 78
-#define LIBAVCODEC_VERSION_MICRO  0
+#define LIBAVCODEC_VERSION_MICRO  1
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \

diff --git a/libavcodec/dvbsub.c b/libavcodec/dvbsub.c
index 0f098266d8a45eec3ce1a0bd867073110a002dbd..ea55cae31783e76be93955d0fab3adf8260be8e5 100644 (file)
--- 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 a815056c7a5e539582e283735cdfdb26baf8744b..820db53e09a76e977e62e394718bea53ba6f38a1 100644 (file)
--- a/libavcodec/dvbsubdec.c
+++ b/libavcodec/dvbsubdec.c
@@ -21,8 +21,8 @@
 #include "avcodec.h"
 #include "dsputil.h"
 #include "get_bits.h"
-#include "colorspace.h"
 #include "bytestream.h"
+#include "libavutil/colorspace.h"
 
 //#define DEBUG
 //#define DEBUG_PACKET_CONTENTS

diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index 75b52566d3e5383c27b20a4714d055069a5fef36..98b766e65330118f699e3f828098de6da314d447 100644 (file)
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@@ -20,8 +20,8 @@
  */
 #include "avcodec.h"
 #include "get_bits.h"
-#include "colorspace.h"
 #include "dsputil.h"
+#include "libavutil/colorspace.h"
 
 //#define DEBUG
 

diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 4984f2cb1bb8f50925ce65873759dd59a3b114c1..68f1a7574614da2bdf3fb06badae794b05ae1e57 100644 (file)
--- 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 ef7c4f8148f995205ade663e59c4c2f3c67a67b5..bf2de6ace22254b9adf3b99361fd7e969c732bc1 100644 (file)
--- 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 55e83f7882956ae5b0aa8e195410b69f5c889f46..786546de838418edb5f9ee6311b8dbec5193f547 100644 (file)
--- 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"
 
 typedef struct {
     int w, h;               ///< output dimensions, a value of 0 will result in the input size

diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 08ffb44a6d357ce0ab0ed71c5710a35175b05e47..d466c5f72eb567433cd1413b08e3cbb25fc2d01b 100644 (file)
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -41,7 +41,7 @@
 
 #define LIBAVUTIL_VERSION_MAJOR 50
 #define LIBAVUTIL_VERSION_MINOR 19
-#define LIBAVUTIL_VERSION_MICRO  0
+#define LIBAVUTIL_VERSION_MICRO  1
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                LIBAVUTIL_VERSION_MINOR, \

diff --git a/libavcodec/colorspace.h b/libavutil/colorspace.h
similarity index 97%
rename from libavcodec/colorspace.h
rename to libavutil/colorspace.h
index 4ec081e9d2278f435819b5805c973adeb634e52e..f4381598117e4e0c3356761c97dcc78e48528d76 100644 (file)
--- 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 */