diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
index 00530a962..54df45ff4 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp
@@ -153,6 +153,10 @@ void FFmpeg_Decoder::open(const std::string &fname)
 
     try
     {
+        for(size_t j = 0;j < mFormatCtx->nb_streams;j++)
+            if(mFormatCtx->streams[j]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+                mFormatCtx->streams[j]->codec->request_sample_fmt = AV_SAMPLE_FMT_S16;
+
         if(avformat_find_stream_info(mFormatCtx, NULL) < 0)
             fail("Failed to find stream info in "+fname);
 
diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
index c80203a25..4147590d6 100644
--- a/cmake/FindFFmpeg.cmake
+++ b/cmake/FindFFmpeg.cmake
@@ -68,6 +68,7 @@ macro(find_component _component _pkgconfig _library _header)
 
   find_path(${_component}_INCLUDE_DIRS ${_header}
     HINTS
+      ${FFMPEGSDK_INC}
       ${PC_LIB${_component}_INCLUDEDIR}
       ${PC_LIB${_component}_INCLUDE_DIRS}
     PATH_SUFFIXES
@@ -76,6 +77,7 @@ macro(find_component _component _pkgconfig _library _header)
 
   find_library(${_component}_LIBRARIES NAMES ${_library}
       HINTS
+      ${FFMPEGSDK_LIB}
       ${PC_LIB${_component}_LIBDIR}
       ${PC_LIB${_component}_LIBRARY_DIRS}
   )
@@ -97,6 +99,12 @@ endmacro()
 # Check for cached results. If there are skip the costly part.
 if (NOT FFMPEG_LIBRARIES)
 
+  set (FFMPEGSDK ENV${FFMPEG_HOME})
+  if (FFMPEGSDK)
+    set (FFMPEGSDK_INC "${FFMPEGSDK}/include")
+    set (FFMPEGSDK_LIB "${FFMPEGSDK}/lib")
+  endif ()
+
   # Check for all possible component.
   find_component(AVCODEC  libavcodec  avcodec  libavcodec/avcodec.h)
   find_component(AVFORMAT libavformat avformat libavformat/avformat.h)