Update ffmpeg

CMakeLists.txt

@@ -32,9 +32,9 @@ if(WIN32)
 	enable_language(RC)
 	set(CMAKE_RC_COMPILER windres)
 	file(
-		DOWNLOAD "https://github.com/TheElixZammuto/sunshine-prebuilt/releases/download/1.0.0/pre-compiled.zip" "${CMAKE_CURRENT_BINARY_DIR}/pre-compiled.zip"
+		DOWNLOAD "https://github.com/SunshineStream/Sunshine-Windows-Prebuilt/releases/download/v1/pre-compiled.zip" "${CMAKE_CURRENT_BINARY_DIR}/pre-compiled.zip"
 		TIMEOUT 60
-		EXPECTED_HASH SHA256=5d59986bd7f619eaaf82b2dd56b5127b747c9cbe8db61e3b898ff6b485298ed6)
+		EXPECTED_HASH SHA256=e0bd75cc9cd98e1c22b8c6805afd9126ce141d46837405bdc10c4458437590a2)
 
 	file(ARCHIVE_EXTRACT
 		INPUT "${CMAKE_CURRENT_BINARY_DIR}/pre-compiled.zip"
@@ -320,8 +320,6 @@ include_directories(
   ${PLATFORM_INCLUDE_DIRS}
 )
 
-add_subdirectory(third-party/cbs)
-
 string(TOUPPER "x${CMAKE_BUILD_TYPE}" BUILD_TYPE)
 if("${BUILD_TYPE}" STREQUAL "XDEBUG")
 	list(APPEND SUNSHINE_COMPILE_OPTIONS -O0 -ggdb3)
@@ -345,12 +343,9 @@ if(NOT SUNSHINE_DEFAULT_DIR)
 	set(SUNSHINE_DEFAULT_DIR "${SUNSHINE_ASSETS_DIR}")
 endif()
 
-list(APPEND CBS_EXTERNAL_LIBRARIES
-	cbs)
 
 list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
 		libminiupnpc-static
-		${CBS_EXTERNAL_LIBRARIES}
 		${CMAKE_THREAD_LIBS_INIT}
 		stdc++fs
 		enet

assets/sunshine.conf

@@ -248,7 +248,7 @@
 #
 ####### rate control #####
 # auto        -- let ffmpeg decide rate control
-# constqp     -- constant QP mode
+# cqp         -- constant QP mode
 # vbr_latency -- Latency Constrained Variable Bitrate
 # vbr_peak    -- Peak Contrained Variable Bitrate
 # cbr         -- constant bitrate

sunshine/config.cpp

@@ -102,14 +102,14 @@ enum quality_e : int {
 };
 
 enum class rc_hevc_e : int {
-  constqp,     /**< Constant QP mode */
+  cqp,         /**< Constant QP mode */
   vbr_latency, /**< Latency Constrained Variable Bitrate */
   vbr_peak,    /**< Peak Contrained Variable Bitrate */
   cbr,         /**< Constant bitrate mode */
 };
 
 enum class rc_h264_e : int {
-  constqp,     /**< Constant QP mode */
+  cqp,         /**< Constant QP mode */
   cbr,         /**< Constant bitrate mode */
   vbr_peak,    /**< Peak Contrained Variable Bitrate */
   vbr_latency, /**< Latency Constrained Variable Bitrate */
@@ -134,7 +134,7 @@ std::optional<quality_e> quality_from_view(const std::string_view &quality) {
 std::optional<int> rc_h264_from_view(const std::string_view &rc) {
 #define _CONVERT_(x) \
   if(rc == #x##sv) return (int)rc_h264_e::x
-  _CONVERT_(constqp);
+  _CONVERT_(cqp);
   _CONVERT_(vbr_latency);
   _CONVERT_(vbr_peak);
   _CONVERT_(cbr);
@@ -145,7 +145,7 @@ std::optional<int> rc_h264_from_view(const std::string_view &rc) {
 std::optional<int> rc_hevc_from_view(const std::string_view &rc) {
 #define _CONVERT_(x) \
   if(rc == #x##sv) return (int)rc_hevc_e::x
-  _CONVERT_(constqp);
+  _CONVERT_(cqp);
   _CONVERT_(vbr_latency);
   _CONVERT_(vbr_peak);
   _CONVERT_(cbr);

sunshine/video.h

@@ -27,6 +27,8 @@ struct packet_raw_t : public AVPacket {
     buf             = nullptr;
     side_data       = nullptr;
     side_data_elems = 0;
+    opaque          = nullptr;
+    opaque_ref      = nullptr;
   }
 
   template<class P>