New upstream version 26.0.0+dfsg1

deps/libff/CMakeLists.txt

@@ -50,15 +50,12 @@ endif(WIN32)
 add_library (libff STATIC
 	${libff_HEADERS}
 	${libff_SOURCES})
+set_target_properties(libff PROPERTIES
+	FOLDER "deps"
+	POSITION_INDEPENDENT_CODE ON)
 
 target_include_directories(libff
 	PUBLIC .)
 
-if(NOT MSVC)
-        if(NOT MINGW)
-                target_compile_options(libff PRIVATE -fPIC)
-        endif()
-endif()
-
 target_link_libraries (libff
 	${FFMPEG_LIBRARIES})

deps/libff/libff/ff-util.c

@@ -291,7 +291,6 @@ static inline bool is_output_device(const AVClass *avclass)
 	if (!avclass)
 		return 0;
 
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52, 66, 101)
 	switch (avclass->category) {
 	case AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT:
 	case AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT:
@@ -300,9 +299,6 @@ static inline bool is_output_device(const AVClass *avclass)
 	default:
 		return false;
 	}
-#else
-	return (avclass->category == AV_CLASS_CATEGORY_OUTPUT);
-#endif
 }
 
 const struct ff_format_desc *ff_format_supported()