@@ -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, \

deleted file mode 100644

@@ -1,111 +0,0 @@

-/*

- * Colorspace conversion defines

- * Copyright (c) 2001, 2002, 2003 Fabrice Bellard

- *

- * This file is part of FFmpeg.

- *

- * FFmpeg is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * FFmpeg is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- * You should have received a copy of the GNU Lesser General Public

- * License along with FFmpeg; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

- */

-

-/**

- * @file

- * Various defines for YUV<->RGB conversion

- */

-

-#ifndef AVCODEC_COLORSPACE_H

-#define AVCODEC_COLORSPACE_H

-

-#define SCALEBITS 10

-#define ONE_HALF  (1 << (SCALEBITS - 1))

-#define FIX(x)    ((int) ((x) * (1<<SCALEBITS) + 0.5))

-

-#define YUV_TO_RGB1_CCIR(cb1, cr1)\

-{\

-    cb = (cb1) - 128;\

-    cr = (cr1) - 128;\

-    r_add = FIX(1.40200*255.0/224.0) * cr + ONE_HALF;\

-    g_add = - FIX(0.34414*255.0/224.0) * cb - FIX(0.71414*255.0/224.0) * cr + \

-            ONE_HALF;\

-    b_add = FIX(1.77200*255.0/224.0) * cb + ONE_HALF;\

-}

-

-#define YUV_TO_RGB2_CCIR(r, g, b, y1)\

-{\

-    y = ((y1) - 16) * FIX(255.0/219.0);\

-    r = cm[(y + r_add) >> SCALEBITS];\

-    g = cm[(y + g_add) >> SCALEBITS];\

-    b = cm[(y + b_add) >> SCALEBITS];\

-}

-

-#define YUV_TO_RGB1(cb1, cr1)\

-{\

-    cb = (cb1) - 128;\

-    cr = (cr1) - 128;\

-    r_add = FIX(1.40200) * cr + ONE_HALF;\

-    g_add = - FIX(0.34414) * cb - FIX(0.71414) * cr + ONE_HALF;\

-    b_add = FIX(1.77200) * cb + ONE_HALF;\

-}

-

-#define YUV_TO_RGB2(r, g, b, y1)\

-{\

-    y = (y1) << SCALEBITS;\

-    r = cm[(y + r_add) >> SCALEBITS];\

-    g = cm[(y + g_add) >> SCALEBITS];\

-    b = cm[(y + b_add) >> SCALEBITS];\

-}

-

-#define Y_CCIR_TO_JPEG(y)\

- cm[((y) * FIX(255.0/219.0) + (ONE_HALF - 16 * FIX(255.0/219.0))) >> SCALEBITS]

-

-#define Y_JPEG_TO_CCIR(y)\

- (((y) * FIX(219.0/255.0) + (ONE_HALF + (16 << SCALEBITS))) >> SCALEBITS)

-

-#define C_CCIR_TO_JPEG(y)\

- cm[(((y) - 128) * FIX(127.0/112.0) + (ONE_HALF + (128 << SCALEBITS))) >> SCALEBITS]

-

-/* NOTE: the clamp is really necessary! */

-static inline int C_JPEG_TO_CCIR(int y) {

-    y = (((y - 128) * FIX(112.0/127.0) + (ONE_HALF + (128 << SCALEBITS))) >> SCALEBITS);

-    if (y < 16)

-        y = 16;

-    return y;

-}

-

-

-#define RGB_TO_Y(r, g, b) \

-((FIX(0.29900) * (r) + FIX(0.58700) * (g) + \

-  FIX(0.11400) * (b) + ONE_HALF) >> SCALEBITS)

-

-#define RGB_TO_U(r1, g1, b1, shift)\

-(((- FIX(0.16874) * r1 - FIX(0.33126) * g1 +         \

-     FIX(0.50000) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128)

-

-#define RGB_TO_V(r1, g1, b1, shift)\

-(((FIX(0.50000) * r1 - FIX(0.41869) * g1 -           \

-   FIX(0.08131) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128)

-

-#define RGB_TO_Y_CCIR(r, g, b) \

-((FIX(0.29900*219.0/255.0) * (r) + FIX(0.58700*219.0/255.0) * (g) + \

-  FIX(0.11400*219.0/255.0) * (b) + (ONE_HALF + (16 << SCALEBITS))) >> SCALEBITS)

-

-#define RGB_TO_U_CCIR(r1, g1, b1, shift)\

-(((- FIX(0.16874*224.0/255.0) * r1 - FIX(0.33126*224.0/255.0) * g1 +         \

-     FIX(0.50000*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128)

-

-#define RGB_TO_V_CCIR(r1, g1, b1, shift)\

-(((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 */

@@ -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, \

new file mode 100644

@@ -0,0 +1,111 @@

+/*

+ * Colorspace conversion defines

+ * Copyright (c) 2001, 2002, 2003 Fabrice Bellard

+ *

+ * This file is part of FFmpeg.

+ *

+ * FFmpeg is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 2.1 of the License, or (at your option) any later version.

+ *

+ * FFmpeg is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with FFmpeg; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+ */

+

+/**

+ * @file

+ * Various defines for YUV<->RGB conversion

+ */

+

+#ifndef AVUTIL_COLORSPACE_H

+#define AVUTIL_COLORSPACE_H

+

+#define SCALEBITS 10

+#define ONE_HALF  (1 << (SCALEBITS - 1))

+#define FIX(x)    ((int) ((x) * (1<<SCALEBITS) + 0.5))

+

+#define YUV_TO_RGB1_CCIR(cb1, cr1)\

+{\

+    cb = (cb1) - 128;\

+    cr = (cr1) - 128;\

+    r_add = FIX(1.40200*255.0/224.0) * cr + ONE_HALF;\

+    g_add = - FIX(0.34414*255.0/224.0) * cb - FIX(0.71414*255.0/224.0) * cr + \

+            ONE_HALF;\

+    b_add = FIX(1.77200*255.0/224.0) * cb + ONE_HALF;\

+}

+

+#define YUV_TO_RGB2_CCIR(r, g, b, y1)\

+{\

+    y = ((y1) - 16) * FIX(255.0/219.0);\

+    r = cm[(y + r_add) >> SCALEBITS];\

+    g = cm[(y + g_add) >> SCALEBITS];\

+    b = cm[(y + b_add) >> SCALEBITS];\

+}

+

+#define YUV_TO_RGB1(cb1, cr1)\

+{\

+    cb = (cb1) - 128;\

+    cr = (cr1) - 128;\

+    r_add = FIX(1.40200) * cr + ONE_HALF;\

+    g_add = - FIX(0.34414) * cb - FIX(0.71414) * cr + ONE_HALF;\

+    b_add = FIX(1.77200) * cb + ONE_HALF;\

+}

+

+#define YUV_TO_RGB2(r, g, b, y1)\

+{\

+    y = (y1) << SCALEBITS;\

+    r = cm[(y + r_add) >> SCALEBITS];\

+    g = cm[(y + g_add) >> SCALEBITS];\

+    b = cm[(y + b_add) >> SCALEBITS];\

+}

+

+#define Y_CCIR_TO_JPEG(y)\

+ cm[((y) * FIX(255.0/219.0) + (ONE_HALF - 16 * FIX(255.0/219.0))) >> SCALEBITS]

+

+#define Y_JPEG_TO_CCIR(y)\

+ (((y) * FIX(219.0/255.0) + (ONE_HALF + (16 << SCALEBITS))) >> SCALEBITS)

+

+#define C_CCIR_TO_JPEG(y)\

+ cm[(((y) - 128) * FIX(127.0/112.0) + (ONE_HALF + (128 << SCALEBITS))) >> SCALEBITS]

+

+/* NOTE: the clamp is really necessary! */

+static inline int C_JPEG_TO_CCIR(int y) {

+    y = (((y - 128) * FIX(112.0/127.0) + (ONE_HALF + (128 << SCALEBITS))) >> SCALEBITS);

+    if (y < 16)

+        y = 16;

+    return y;

+}

+

+

+#define RGB_TO_Y(r, g, b) \

+((FIX(0.29900) * (r) + FIX(0.58700) * (g) + \

+  FIX(0.11400) * (b) + ONE_HALF) >> SCALEBITS)

+

+#define RGB_TO_U(r1, g1, b1, shift)\

+(((- FIX(0.16874) * r1 - FIX(0.33126) * g1 +         \

+     FIX(0.50000) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128)

+

+#define RGB_TO_V(r1, g1, b1, shift)\

+(((FIX(0.50000) * r1 - FIX(0.41869) * g1 -           \

+   FIX(0.08131) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128)

+

+#define RGB_TO_Y_CCIR(r, g, b) \

+((FIX(0.29900*219.0/255.0) * (r) + FIX(0.58700*219.0/255.0) * (g) + \

+  FIX(0.11400*219.0/255.0) * (b) + (ONE_HALF + (16 << SCALEBITS))) >> SCALEBITS)

+

+#define RGB_TO_U_CCIR(r1, g1, b1, shift)\

+(((- FIX(0.16874*224.0/255.0) * r1 - FIX(0.33126*224.0/255.0) * g1 +         \

+     FIX(0.50000*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128)

+

+#define RGB_TO_V_CCIR(r1, g1, b1, shift)\

+(((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 /* AVUTIL_COLORSPACE_H */