[FFmpeg-cvslog] swscale: rename sws_context_class to ff_sws_context_class
Andreas Cadhalpun
git at videolan.org
Thu Oct 29 23:51:46 CET 2015
ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Tue Oct 27 22:56:53 2015 +0100| [8bfbc8c5e504ef3ae914499646d450987b419385] | committer: Andreas Cadhalpun
swscale: rename sws_context_class to ff_sws_context_class
It is an internal swscale symbol and thus should not be exported.
Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8bfbc8c5e504ef3ae914499646d450987b419385
---
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 cf793ef..e666e5a 100644
--- a/libswscale/options.c
+++ b/libswscale/options.c
@@ -84,7 +84,7 @@ static const AVOption swscale_options[] = {
{ NULL }
};
-const AVClass sws_context_class = {
+const AVClass ff_sws_context_class = {
.class_name = "SWScaler",
.item_name = sws_context_to_name,
.option = swscale_options,
@@ -94,5 +94,5 @@ const AVClass sws_context_class = {
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 27a40af..a53fdc4 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -866,7 +866,7 @@ extern const uint8_t ff_dither_8x8_220[9][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 651b07a..037683c 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1030,7 +1030,7 @@ SwsContext *sws_alloc_context(void)
av_assert0(offsetof(SwsContext, redDither) + DITHER32_INT == offsetof(SwsContext, dither32));
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