Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #809 from scarabeusiv/ffmpeg10

Add support for new ffmpeg-10/11 api.
  • Loading branch information...
commit 03c298e013b83e0fbadec89e7df37fd37a436c52 2 parents 767a8e5 + de23d26
@elupus elupus authored
Showing with 6 additions and 0 deletions.
  1. +3 −0  configure.in
  2. +3 −0  lib/DllAvUtil.h
View
3  configure.in
@@ -1214,6 +1214,9 @@ if test "$use_external_ffmpeg" = "yes"; then
# old FFmpeg have this in libavcodec/opt.h instead:
AC_CHECK_HEADERS([libavutil/opt.h])
+ # new FFmpeg have math headers
+ AC_CHECK_HEADERS([libavutil/mathematics.h],,)
+
# We'll support the use of rgb2rgb.h if it exists.
AC_CHECK_HEADERS([libswscale/rgb2rgb.h],,)
AC_CHECK_HEADERS([ffmpeg/rgb2rgb.h],,)
View
3  lib/DllAvUtil.h
@@ -59,6 +59,9 @@ extern "C" {
#else
#include <ffmpeg/mem.h>
#endif
+ #if (defined HAVE_LIBAVUTIL_MATHEMATICS_H)
+ #include <libavutil/mathematics.h>
+ #endif
#else
#include "libavutil/avutil.h"
#include "libavutil/audioconvert.h"
Please sign in to comment.
Something went wrong with that request. Please try again.