[FFmpeg-devel] [PATCH 1/3] swscale: rename sws_alloc_set_opts to ff_sws_alloc_set_opts

[Andreas Cadhalpun]

It is an internal swscale function and thus should not be exported.

Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
---
 libswscale/swscale_internal.h |  2 +-
 libswscale/utils.c            | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 27a40af..ec0399b 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -916,7 +916,7 @@ void ff_hcscale_fast_mmxext(SwsContext *c, int16_t *dst1, 
int16_t *dst2,
  *
  * @see sws_getContext()
  */
-struct SwsContext *sws_alloc_set_opts(int srcW, int srcH, enum AVPixelFormat 
srcFormat,
+struct SwsContext *ff_sws_alloc_set_opts(int srcW, int srcH, enum 
AVPixelFormat srcFormat,
                                       int dstW, int dstH, enum AVPixelFormat 
dstFormat,
                                       int flags, const double *param);
 
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 651b07a..e723079 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -902,7 +902,7 @@ int sws_setColorspaceDetails(struct SwsContext *c, const 
int inv_table[4],
             if (ret < 0)
                 return ret;
 
-            c->cascaded_context[0] = sws_alloc_set_opts(srcW, srcH, 
c->srcFormat,
+            c->cascaded_context[0] = ff_sws_alloc_set_opts(srcW, srcH, 
c->srcFormat,
                                                         tmp_width, tmp_height, 
tmp_format,
                                                         c->flags, c->param);
             if (!c->cascaded_context[0])
@@ -1492,7 +1492,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter 
*srcFilter,
             if (ret < 0)
                 return ret;
 
-            c->cascaded_context[0] = sws_alloc_set_opts(srcW, srcH, srcFormat,
+            c->cascaded_context[0] = ff_sws_alloc_set_opts(srcW, srcH, 
srcFormat,
                                                         srcW, srcH, tmpFormat,
                                                         flags, c->param);
             if (!c->cascaded_context[0])
@@ -1502,7 +1502,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter 
*srcFilter,
             if (ret < 0)
                 return ret;
 
-            c->cascaded_context[1] = sws_alloc_set_opts(srcW, srcH, tmpFormat,
+            c->cascaded_context[1] = ff_sws_alloc_set_opts(srcW, srcH, 
tmpFormat,
                                                         dstW, dstH, dstFormat,
                                                         flags, c->param);
             if (!c->cascaded_context[1])
@@ -1826,7 +1826,7 @@ fail: // FIXME replace things by appropriate error codes
     return -1;
 }
 
-SwsContext *sws_alloc_set_opts(int srcW, int srcH, enum AVPixelFormat 
srcFormat,
+SwsContext *ff_sws_alloc_set_opts(int srcW, int srcH, enum AVPixelFormat 
srcFormat,
                                int dstW, int dstH, enum AVPixelFormat 
dstFormat,
                                int flags, const double *param)
 {
@@ -1858,7 +1858,7 @@ SwsContext *sws_getContext(int srcW, int srcH, enum 
AVPixelFormat srcFormat,
 {
     SwsContext *c;
 
-    c = sws_alloc_set_opts(srcW, srcH, srcFormat,
+    c = ff_sws_alloc_set_opts(srcW, srcH, srcFormat,
                            dstW, dstH, dstFormat,
                            flags, param);
     if (!c)
-- 
2.6.1


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