Commit 2b4abbd6 authored by Stefano Sabatini's avatar Stefano Sabatini

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
parent 39bb30f6
......@@ -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"
......
......@@ -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"
......
......@@ -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, \
......
......@@ -20,7 +20,7 @@
*/
#include "avcodec.h"
#include "bytestream.h"
#include "colorspace.h"
#include "libavutil/colorspace.h"
typedef struct DVBSubtitleContext {
int hide_state;
......
......@@ -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
......
......@@ -20,8 +20,8 @@
*/
#include "avcodec.h"
#include "get_bits.h"
#include "colorspace.h"
#include "dsputil.h"
#include "libavutil/colorspace.h"
//#define DEBUG
......
......@@ -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
......
......@@ -26,8 +26,8 @@
#include "avcodec.h"
#include "dsputil.h"
#include "colorspace.h"
#include "bytestream.h"
#include "libavutil/colorspace.h"
//#define DEBUG_PACKET_CONTENTS
......
......@@ -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
......
......@@ -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, \
......
......@@ -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 */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment