[SCM] libav/experimental: Remove duplicated RGB_TO_[YUV] macros, use those included in libavcodec/colorspace.h.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit ecfe3929da6f5e53ca4d51e215b0c3597d2183cb
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Fri May 22 22:51:46 2009 +0000

    Remove duplicated RGB_TO_[YUV] macros, use those included in
    libavcodec/colorspace.h.
    
    Originally committed as revision 18901 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 5f407c9..f2c1e79 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -36,6 +36,7 @@
 #include "libswscale/swscale.h"
 #include "libavcodec/opt.h"
 #include "libavcodec/audioconvert.h"
+#include "libavcodec/colorspace.h"
 #include "libavutil/fifo.h"
 #include "libavutil/avstring.h"
 #include "libavformat/os_support.h"
@@ -2456,23 +2457,6 @@ static void opt_frame_size(const char *arg)
     }
 }
 
-
-#define SCALEBITS 10
-#define ONE_HALF  (1 << (SCALEBITS - 1))
-#define FIX(x)    ((int) ((x) * (1<<SCALEBITS) + 0.5))
-
-#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)
-
 static void opt_pad_color(const char *arg) {
     /* Input is expected to be six hex digits similar to
        how colors are expressed in html tags (but without the #) */

-- 
Libav/FFmpeg packaging