Re: [FFmpeg-devel] [PATCH 3/3] swscale: rename sws_rgb2rgb_init to ff_sws_rgb2rgb_init

2015-10-29 Thread Andreas Cadhalpun 
On 28.10.2015 00:22, Michael Niedermayer wrote:
> On Tue, Oct 27, 2015 at 11:11:09PM +0100, Andreas Cadhalpun wrote:
>> It is an internal swscale function and thus should not be exported.
>>
>> Signed-off-by: Andreas Cadhalpun 
>> ---
>>  libswscale/colorspace-test.c | 2 +-
>>  libswscale/rgb2rgb.c | 2 +-
>>  libswscale/rgb2rgb.h | 2 +-
>>  libswscale/utils.c   | 2 +-
>>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> probably ok

Pushed.

Best regards,
Andreas

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH 3/3] swscale: rename sws_rgb2rgb_init to ff_sws_rgb2rgb_init

2015-10-27 Thread Andreas Cadhalpun 
It is an internal swscale function and thus should not be exported.

Signed-off-by: Andreas Cadhalpun 
---
 libswscale/colorspace-test.c | 2 +-
 libswscale/rgb2rgb.c | 2 +-
 libswscale/rgb2rgb.h | 2 +-
 libswscale/utils.c   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libswscale/colorspace-test.c b/libswscale/colorspace-test.c
index 42a915b..f6e0c92 100644
--- a/libswscale/colorspace-test.c
+++ b/libswscale/colorspace-test.c
@@ -45,7 +45,7 @@ int main(int argc, char **argv)
 return -1;
 
 av_log(NULL, AV_LOG_INFO, "memory corruption test ...\n");
-sws_rgb2rgb_init();
+ff_sws_rgb2rgb_init();
 
 for (funcNum = 0; ; funcNum++) {
 struct func_info_s {
diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c
index 340174f..f7f8188 100644
--- a/libswscale/rgb2rgb.c
+++ b/libswscale/rgb2rgb.c
@@ -130,7 +130,7 @@ void (*yuyvtoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t 
*vdst,
  * 32-bit C version, and and trick by Michael Niedermayer
  */
 
-av_cold void sws_rgb2rgb_init(void)
+av_cold void ff_sws_rgb2rgb_init(void)
 {
 rgb2rgb_init_c();
 if (ARCH_X86)
diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h
index 8faebe6..0645404 100644
--- a/libswscale/rgb2rgb.h
+++ b/libswscale/rgb2rgb.h
@@ -164,7 +164,7 @@ extern void (*yuyvtoyuv422)(uint8_t *ydst, uint8_t *udst, 
uint8_t *vdst, const u
 int width, int height,
 int lumStride, int chromStride, int srcStride);
 
-void sws_rgb2rgb_init(void);
+void ff_sws_rgb2rgb_init(void);
 
 void rgb2rgb_init_x86(void);
 
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 0624022..23a35f6 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1127,7 +1127,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter 
*srcFilter,
 flags = c->flags;
 emms_c();
 if (!rgb15to16)
-sws_rgb2rgb_init();
+ff_sws_rgb2rgb_init();
 
 unscaled = (srcW == dstW && srcH == dstH);
 
-- 
2.6.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 3/3] swscale: rename sws_rgb2rgb_init to ff_sws_rgb2rgb_init

2015-10-27 Thread Michael Niedermayer 
On Tue, Oct 27, 2015 at 11:11:09PM +0100, Andreas Cadhalpun wrote:
> It is an internal swscale function and thus should not be exported.
> 
> Signed-off-by: Andreas Cadhalpun 
> ---
>  libswscale/colorspace-test.c | 2 +-
>  libswscale/rgb2rgb.c | 2 +-
>  libswscale/rgb2rgb.h | 2 +-
>  libswscale/utils.c   | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)

probably ok

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The bravest are surely those who have the clearest vision
of what is before them, glory and danger alike, and yet
notwithstanding go out to meet it. -- Thucydides


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel