Merge branch 'master' of git@git.videolan.org:vlc

diff --cc configure.ac
index 1e7652ef75f9294f29a5d56fa007fa7ca71706a6,056f89fff28353706d81dacede6cec96845bfc91..fb32591c213d8c1fb93aa9ee1c1d5e465685930d
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -3021,9 -3028,11 +3028,8 @@@ dnl Trying with pkg-confi
         VLC_ADD_LIBS([ffmpeg],[${SWSCALE_LIBS}])
         AC_CHECK_LIB(swscale, sws_getContext,
           [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.])],
          [${FFMPEG_LIBS}])