Merge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b'

[ffmpeg] / libswscale / utils.c

diff --git a/libswscale/utils.c b/libswscale/utils.c
index 4f3ce2787872cfcdc0e1da58c286ad5b85b8503e..06fd358d94541fd1bf5dc06f75ed141a68ae0d9f 100644 (file)
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1493,7 +1493,6 @@ fail: // FIXME replace things by appropriate error codes
     return -1;
 }
 
-#if FF_API_SWS_GETCONTEXT
 SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat,
                            int dstW, int dstH, enum AVPixelFormat dstFormat,
                            int flags, SwsFilter *srcFilter,
@@ -1524,7 +1523,6 @@ SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat,
 
     return c;
 }
-#endif
 
 SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur,
                                 float lumaSharpen, float chromaSharpen,