diff --git a/.ci/linux/build.sh b/.ci/linux/build.sh
index aa15333ac2..093b30a7ea 100755
--- a/.ci/linux/build.sh
+++ b/.ci/linux/build.sh
@@ -36,15 +36,16 @@ case "$1" in
         ARCH=armv9
         ARCH_FLAGS="-march=armv9-a -mtune=generic -w"
         ;;
+    *)
+        echo "Invalid target $1 specified, must be one of amd64, steamdeck, allyx, rog-ally, legacy, aarch64, armv9"
+        exit 1
+        ;;
 esac
 
 export ARCH_FLAGS="$ARCH_FLAGS -O3"
 
-NPROC="$2"
 if [ -z "$NPROC" ]; then
     NPROC="$(nproc)"
-else
-    shift
 fi
 
 if [ "$1" != "" ]; then shift; fi
@@ -72,11 +73,15 @@ else
     MULTIMEDIA=ON
 fi
 
+if [ -z "$BUILD_TYPE" ]; then
+    export BUILD_TYPE="Release"
+fi
+
 export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" $@)
 
 mkdir -p build && cd build
 cmake .. -G Ninja \
-    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
 	-DENABLE_QT_TRANSLATION=ON \
     -DUSE_DISCORD_PRESENCE=ON \
     -DCMAKE_CXX_FLAGS="$ARCH_FLAGS" \
diff --git a/.ci/windows/build.sh b/.ci/windows/build.sh
index 667fd316fa..d0c697655a 100644
--- a/.ci/windows/build.sh
+++ b/.ci/windows/build.sh
@@ -17,6 +17,10 @@ else
     export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DYUZU_USE_BUNDLED_QT=OFF)
 fi
 
+if [ -z "$BUILD_TYPE" ]; then
+    export BUILD_TYPE="Release"
+fi
+
 if [ "$WINDEPLOYQT" == "" ]; then
     echo "You must supply the WINDEPLOYQT environment variable."
     exit 1
@@ -38,7 +42,7 @@ export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" $@)
 
 mkdir -p build && cd build
 cmake .. -G Ninja \
-    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
 	-DENABLE_QT_TRANSLATION=ON \
     -DUSE_DISCORD_PRESENCE=ON \
     -DYUZU_USE_BUNDLED_SDL2=OFF \
diff --git a/src/video_core/host1x/ffmpeg/ffmpeg.cpp b/src/video_core/host1x/ffmpeg/ffmpeg.cpp
index 9b718f2591..d6eff2bdd7 100644
--- a/src/video_core/host1x/ffmpeg/ffmpeg.cpp
+++ b/src/video_core/host1x/ffmpeg/ffmpeg.cpp
@@ -26,13 +26,14 @@ namespace {
 constexpr AVPixelFormat PreferredGpuFormat = AV_PIX_FMT_NV12;
 constexpr AVPixelFormat PreferredCpuFormat = AV_PIX_FMT_YUV420P;
 constexpr std::array PreferredGpuDecoders = {
-    AV_HWDEVICE_TYPE_CUDA,
 #ifdef _WIN32
+    AV_HWDEVICE_TYPE_CUDA,
     AV_HWDEVICE_TYPE_D3D11VA,
     AV_HWDEVICE_TYPE_DXVA2,
+#elif defined(__FreeBSD__)
+    AV_HWDEVICE_TYPE_VDPAU,
 #elif defined(__unix__)
     AV_HWDEVICE_TYPE_VAAPI,
-    AV_HWDEVICE_TYPE_VDPAU,
 #endif
     AV_HWDEVICE_TYPE_VULKAN,
 };
@@ -215,18 +216,16 @@ bool DecoderContext::OpenContext(const Decoder& decoder) {
 
 bool DecoderContext::SendPacket(const Packet& packet) {
 	m_temp_frame = std::make_shared<Frame>();
-	
-    if (const int ret = avcodec_send_packet(m_codec_context, packet.GetPacket()); ret < 0) {
+    if (const int ret = avcodec_send_packet(m_codec_context, packet.GetPacket()); ret < 0 && ret != AVERROR_EOF) {
         LOG_ERROR(HW_GPU, "avcodec_send_packet error: {}", AVError(ret));
         return false;
     }
-	
     return true;
 }
 
 std::shared_ptr<Frame> DecoderContext::ReceiveFrame() {
 	auto ReceiveImpl = [&](AVFrame* frame) -> bool {
-		if (const int ret = avcodec_receive_frame(m_codec_context, frame); ret < 0) {
+		if (const int ret = avcodec_receive_frame(m_codec_context, frame); ret < 0 && ret != AVERROR_EOF) {
 			LOG_ERROR(HW_GPU, "avcodec_receive_frame error: {}", AVError(ret));
 			return false;
 		}