diff --git lib/cpluff/autogen.sh lib/cpluff/autogen.sh
index ee0a418..efd5291 100755
--- lib/cpluff/autogen.sh
+++ lib/cpluff/autogen.sh
@@ -15,7 +15,7 @@ fi
 
 # Generate files in top level directory
 cd "$basedir"
-autopoint
+#autopoint
 rm -f ABOUT-NLS
 test -d auxliary || mkdir auxliary
 libtoolize --automake -f
diff --git tools/depends/target/ffmpeg/Makefile tools/depends/target/ffmpeg/Makefile
index 0e08dcf..e94d78f 100644
--- tools/depends/target/ffmpeg/Makefile
+++ tools/depends/target/ffmpeg/Makefile
@@ -21,6 +21,11 @@ ffmpg_config += --enable-encoder=wmav2 --enable-protocol=http
 ifeq ($(CROSS_COMPILING), yes)
   ffmpg_config += --arch=$(CPU) --enable-cross-compile
 endif
+ifeq ($(OS), freebsd)
+  ffmpg_config += --target-os=$(OS) --cpu=$(CPU)
+  ffmpg_config += --enable-vdpau --enable-vaapi --enable-gnutls
+  ffmpg_config += --enable-libvorbis --enable-muxer=ogg --enable-encoder=libvorbis
+endif
 ifeq ($(OS), linux)
   ffmpg_config += --target-os=$(OS) --cpu=$(CPU)
   ffmpg_config += --enable-vdpau --enable-vaapi --enable-gnutls
diff --git xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
index 2b6e646..babfe89 100644
--- xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
+++ xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
@@ -289,6 +289,8 @@ bool CAESinkOSS::Initialize(AEAudioFormat &format, std::string &device)
 #endif
 
   int tmp = (CAEUtil::DataFormatToBits(format.m_dataFormat) >> 3) * format.m_channelLayout.Count() * OSS_FRAMES;
+  if (AE_IS_RAW_HD(format.m_dataFormat) && m_initFormat.m_dataFormat != AE_FMT_LPCM)
+    tmp *= 8;
   int pos = 0;
   while ((tmp & 0x1) == 0x0)
   {