Fix check for img_resample and sws_getContext
authorRafaël Carré <funman@videolan.org>
Tue, 27 May 2008 22:44:20 +0000 (00:44 +0200)
committerRafaël Carré <funman@videolan.org>
Tue, 27 May 2008 22:44:35 +0000 (00:44 +0200)
configure.ac

index 2dff37a..b69c5b3 100644 (file)
@@ -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