New upstream version 26.1.0+dfsg1

deps/CMakeLists.txt

@@ -19,9 +19,7 @@ if(WIN32)
 	add_subdirectory(lzma)
 endif()
 
-if(BUILD_CAPTIONS)
-	add_subdirectory(libcaption)
-endif()
+add_subdirectory(libcaption)
 
 find_package(Jansson 2.5 QUIET)
 

deps/json11/json11.cpp

@@ -441,9 +441,9 @@ struct JsonParser final {
      */
     char get_next_token() {
         consume_garbage();
-        if (failed) return (char)0;
+        if (failed) return static_cast<char>(0);
         if (i == str.size())
-            return fail("unexpected end of input", (char)0);
+            return fail("unexpected end of input", static_cast<char>(0));
 
         return str[i++];
     }
@@ -775,8 +775,10 @@ bool Json::has_shape(const shape & types, string & err) const {
         return false;
     }
 
+    const auto& obj_items = object_items();
     for (auto & item : types) {
-        if ((*this)[item.first].type() != item.second) {
+        const auto it = obj_items.find(item.first);
+        if (it == obj_items.cend() || it->second.type() != item.second) {
             err = "bad type for " + item.first + " in " + dump();
             return false;
         }

deps/media-playback/media-playback/decode.c

@@ -246,14 +246,14 @@ void mp_decode_push_packet(struct mp_decode *decode, AVPacket *packet)
 static inline int64_t get_estimated_duration(struct mp_decode *d,
 					     int64_t last_pts)
 {
-	if (last_pts)
-		return d->frame_pts - last_pts;
-
 	if (d->audio) {
 		return av_rescale_q(d->in_frame->nb_samples,
 				    (AVRational){1, d->in_frame->sample_rate},
 				    (AVRational){1, 1000000000});
 	} else {
+		if (last_pts)
+			return d->frame_pts - last_pts;
+
 		if (d->last_duration)
 			return d->last_duration;
 

deps/obs-scripting/CMakeLists.txt

@@ -87,10 +87,6 @@ if(UI_ENABLED)
 	include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/UI/obs-frontend-api")
 endif()
 
-IF(BUILD_CAPTIONS)
-	string(TOUPPER "${BUILD_CAPTIONS}" BUILD_CAPTIONS)
-endif()
-
 configure_file(
 	"${CMAKE_CURRENT_SOURCE_DIR}/obs-scripting-config.h.in"
 	"${CMAKE_CURRENT_BINARY_DIR}/obs-scripting-config.h")

deps/obs-scripting/obs-scripting-config.h.in

@@ -21,4 +21,3 @@
 #define COMPILE_LUA    @LUAJIT_FOUND@
 #define COMPILE_PYTHON @PYTHON_FOUND@
 #define UI_ENABLED     @UI_ENABLED@
-#define BUILD_CAPTIONS @BUILD_CAPTIONS@

deps/obs-scripting/obs-scripting-lua.c

@@ -456,7 +456,7 @@ static int obs_lua_signal_handler_disconnect(lua_State *script)
 		const char *cb_signal =
 			calldata_string(&cb->base.extra, "signal");
 
-		if (cb_signal && strcmp(signal, cb_signal) != 0 &&
+		if (cb_signal && strcmp(signal, cb_signal) == 0 &&
 		    handler == cb_handler)
 			break;