From 2b4abbd6f5f065a41d48622154cb7fd045247f2f Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Thu, 1 Jul 2010 18:49:44 +0000
Subject: [PATCH] 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
---
ffmpeg.c | 2 +-
ffplay.c | 2 +-
libavcodec/avcodec.h | 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 +-
libavutil/avutil.h | 2 +-
{libavcodec => libavutil}/colorspace.h | 6 +++---
11 files changed, 13 insertions(+), 13 deletions(-)
rename {libavcodec => libavutil}/colorspace.h (97%)
diff --git a/ffmpeg.c b/ffmpeg.c
index 714dc0d40fd..e4b4b9eb95a 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 e65226a4539..a43dbb1e6f4 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/avcodec.h b/libavcodec/avcodec.h
index 2eb2ff683e8..5841d6a4c80 100644
--- 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 0f098266d8a..ea55cae3178 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 a815056c7a5..820db53e09a 100644
--- 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 75b52566d3e..98b766e6533 100644
--- 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 4984f2cb1bb..68f1a757461 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 ef7c4f8148f..bf2de6ace22 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 55e83f78829..786546de838 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"
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 08ffb44a6d3..d466c5f72eb 100644
--- 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 4ec081e9d22..f4381598117 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 */
--
GitLab