From eb2a93ebdb031bd73d4e2361b4178f9a30f76b83 Mon Sep 17 00:00:00 2001 From: wang-bin Date: Fri, 17 Jan 2014 11:04:37 +0800 Subject: [PATCH] fix build error for ffmpeg 0.9 and 0.10. no swr_get_delay --- src/QtAV/QtAV_Compat.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/QtAV/QtAV_Compat.h b/src/QtAV/QtAV_Compat.h index 48442039..90b35214 100644 --- a/src/QtAV/QtAV_Compat.h +++ b/src/QtAV/QtAV_Compat.h @@ -47,7 +47,8 @@ extern "C" #ifndef LIBSWRESAMPLE_VERSION_INT //ffmpeg 0.9, swr 0.5 #define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, LIBSWRESAMPLE_VERSION_MINOR, LIBSWRESAMPLE_VERSION_MICRO) #endif //LIBSWRESAMPLE_VERSION_INT -#define HAVE_SWR_GET_DELAY (LIBSWRESAMPLE_VERSION_INT > AV_VERSION_INT(0, 5, 0)) +//ffmpeg >= 0.11.x. swr0.6.100: ffmpeg-0.10.x +#define HAVE_SWR_GET_DELAY (LIBSWRESAMPLE_VERSION_INT > AV_VERSION_INT(0, 6, 100)) #endif //QTAV_HAVE(SWRESAMPLE) #if QTAV_HAVE(AVRESAMPLE) #include