[FFmpeg-cvslog] swscale: Rename sws_context_class to ff_sws_context_class

Andreas Cadhalpun git at videolan.org
Tue Jan 24 20:24:20 EET 2017


ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Tue Oct 27 22:56:53 2015 +0100| [c0fd2fb27bebd1d5ab028e6df6bca9119d269122] | committer: Diego Biurrun

swscale: Rename sws_context_class to ff_sws_context_class

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

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Diego Biurrun <diego at biurrun.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0fd2fb27bebd1d5ab028e6df6bca9119d269122
---

 libswscale/options.c          | 4 ++--
 libswscale/swscale_internal.h | 2 +-
 libswscale/utils.c            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libswscale/options.c b/libswscale/options.c
index e7765d6..2371b67 100644
--- a/libswscale/options.c
+++ b/libswscale/options.c
@@ -66,9 +66,9 @@ static const AVOption swscale_options[] = {
     { NULL }
 };
 
-const AVClass sws_context_class = { "SWScaler", sws_context_to_name, swscale_options };
+const AVClass ff_sws_context_class = { "SWScaler", sws_context_to_name, swscale_options };
 
 const AVClass *sws_get_class(void)
 {
-    return &sws_context_class;
+    return &ff_sws_context_class;
 }
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 26b9430..a72ac0b 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -714,7 +714,7 @@ extern const uint8_t ff_dither_8x8_220[8][8];
 
 extern const int32_t ff_yuv2rgb_coeffs[8][4];
 
-extern const AVClass sws_context_class;
+extern const AVClass ff_sws_context_class;
 
 /**
  * Set c->swscale to an unscaled converter if one exists for the specific
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 129643a..d549348 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -867,7 +867,7 @@ SwsContext *sws_alloc_context(void)
     SwsContext *c = av_mallocz(sizeof(SwsContext));
 
     if (c) {
-        c->av_class = &sws_context_class;
+        c->av_class = &ff_sws_context_class;
         av_opt_set_defaults(c);
     }
 



More information about the ffmpeg-cvslog mailing list