[vlc-devel] commit: Fix check for img_resample and sws_getContext ( Rafaël Carré )

[git version control]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed May 28 00:44:20 2008 +0200| [1589b92e3257e215cdffe6525a9d811d468651ea]

Fix check for img_resample and sws_getContext

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1589b92e3257e215cdffe6525a9d811d468651ea
---

 configure.ac |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2dff37a..b69c5b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3023,12 +3023,13 @@ dnl Trying with pkg-config
          [AC_CHECK_HEADERS([ffmpeg/swscale.h libswscale/swscale.h])],
          [AC_CHECK_LIB(avcodec,img_resample,[],
             [AC_MSG_ERROR([Your FFmpeg library doesn't have the needed img_resample() function. You should rebuild it with software scaler disabled, or install the swscale headers.])],
+         [${FFMPEG_LIBS}])
+         ],
          [${SWSCALE_LIBS}])
-       ])
      VLC_RESTORE_FLAGS
     ],[AC_CHECK_LIB(avcodec,img_resample,[],
         [AC_MSG_ERROR([Your FFmpeg library doesn't have the needed img_resample() function. You should rebuild it with software scaler disabled, or install the swscale headers.])],
-        [${SWSCALE_LIBS}])
+        [${FFMPEG_LIBS}])
       ]
     )
 
@@ -3074,7 +3075,8 @@ dnl Trying with pkg-config
         [-lavcodec $LDAVUTIL])
       LDFLAGS="${LDFLAGS_save}"
       CPPFLAGS="${CPPFLAGS_save}"
-    ])
+      ],
+      [${SWSCALE_LIBS}])
   ])
 fi