3 files changed, 18 insertions, 6 deletions
diff --git a/xbmc/cores/dvdplayer/Codecs/DllAvFormat.h b/xbmc/cores/dvdplayer/Codecs/DllAvFormat.h
index 28aeae1954..9183d2b720 100644
--- a/xbmc/cores/dvdplayer/Codecs/DllAvFormat.h
+++ b/xbmc/cores/dvdplayer/Codecs/DllAvFormat.h
@@ -15,8 +15,12 @@ extern "C" {
 #ifndef __GNUC__
 #pragma warning(disable:4244)
 #endif
-#if (defined USE_EXTERNAL_FFMPEG) || (defined _WIN32)
-  #include <libavformat/avformat.h>
+#if (defined USE_EXTERNAL_FFMPEG)
+  #if (defined HAVE_LIBAVFORMAT_AVFORMAT_H)
+    #include <libavformat/avformat.h>
+  #else
+    #include <ffmpeg/avformat.h>
+  #endif
 #else
   #include "libavformat/avformat.h"
 #endif
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h b/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h
index 754feea4d1..f2e18e5ea1 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h
+++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h
@@ -42,8 +42,12 @@ extern "C" {
 #ifndef __GNUC__
 #pragma warning(disable:4244)
 #endif
-#if (defined USE_EXTERNAL_FFMPEG) || (defined _WIN32)
-  #include <libavcodec/avcodec.h>
+#if (defined USE_EXTERNAL_FFMPEG)
+  #if (defined HAVE_LIBAVCODEC_AVCODEC_H)
+    #include <libavcodec/avcodec.h>
+  #else
+    #include <ffmpeg/avcodec.h>
+  #endif
 #else
   #include "libavcodec/avcodec.h"
 #endif
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.cpp
index 62055739e6..cd794ddb11 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.cpp
+++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.cpp
@@ -26,8 +26,12 @@
 #include "DVDClock.h"
 #include "utils/log.h"
 extern "C" {
-#if (defined USE_EXTERNAL_FFMPEG) || (defined WIN32)
-  #include <libavcodec/avcodec.h>
+#if (defined USE_EXTERNAL_FFMPEG)
+  #if (defined HAVE_LIBAVCODEC_AVCODEC_H)
+    #include <libavcodec/avcodec.h>
+  #else
+    #include <ffmpeg/avcodec.h>
+  #endif
 #else
   #include "libavcodec/avcodec.h"
 #endif