1 --- configure.in.org 2009-03-18 23:03:33.397335774 +0100
2 +++ configure.in 2009-03-18 23:04:10.016786290 +0100
6 if test x"$with_ffmpeg" = "xyes"; then
7 - AC_CHECK_HEADER(ffmpeg/avcodec.h,
8 + AC_CHECK_HEADER(libavcodec/avcodec.h,
9 AC_SEARCH_LIBS([avcodec_decode_video],[avcodec_pic avcodec], [
10 AC_SEARCH_LIBS([av_open_input_file], [avformat_pic avformat],
16 - AC_CHECK_HEADER([ffmpeg/swscale.h],
17 + AC_CHECK_HEADER([libswscale/swscale.h],
18 AC_CHECK_LIB(swscale,sws_getContext,
20 AC_DEFINE(HAVE_FFMPEG_SWSCALE,,[ffmpeg's libswscale])
21 --- otherlibs/highgui/cvcap_ffmpeg.cpp~ 2008-09-29 22:49:15.000000000 +0200
22 +++ otherlibs/highgui/cvcap_ffmpeg.cpp 2009-03-18 23:08:26.526923830 +0100
27 -#include <ffmpeg/avformat.h>
28 -#include <ffmpeg/avcodec.h>
29 +#include <libavformat/avformat.h>
30 +#include <libavcodec/avcodec.h>
31 #if defined(HAVE_FFMPEG_SWSCALE)
32 -#include <ffmpeg/swscale.h>
33 +#include <libswscale/swscale.h>