R3944Realms/srs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix no ffmpeg bug.

Browse Source
This commit is contained in:
winlin 2025-10-28 09:19:26 -04:00
parent e600afae1e
commit 6ead8d957a
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/src/main/srs_main_server.cpp
View File

@ -64,8 +64,10 @@ SrsConfig *_srs_config = NULL;
ISrsAppFactory *_srs_app_factory = new SrsAppFactory(); ISrsAppFactory *_srs_app_factory = new SrsAppFactory();
ISrsKernelFactory *_srs_kernel_factory = _srs_app_factory; ISrsKernelFactory *_srs_kernel_factory = _srs_app_factory;
#ifdef SRS_FFMPEG_FIT
// Register FFmpeg log callback funciton. // Register FFmpeg log callback funciton.
SrsFFmpegLogHelper _srs_ffmpeg_log_helper; SrsFFmpegLogHelper _srs_ffmpeg_log_helper;
#endif
// @global version of srs, which can grep keyword "XCORE" // @global version of srs, which can grep keyword "XCORE"
extern const char *_srs_version; extern const char *_srs_version;

4
trunk/src/utest/srs_utest.cpp
View File

@ -54,8 +54,10 @@ bool _srs_config_by_env = false;
ISrsAppFactory *_srs_app_factory = new SrsAppFactory(); ISrsAppFactory *_srs_app_factory = new SrsAppFactory();
ISrsKernelFactory *_srs_kernel_factory = _srs_app_factory; ISrsKernelFactory *_srs_kernel_factory = _srs_app_factory;
#ifdef SRS_FFMPEG_FIT
// Register FFmpeg log callback funciton. // Register FFmpeg log callback funciton.
SrsFFmpegLogHelper _srs_ffmpeg_log_helper; SrsFFmpegLogHelper _srs_ffmpeg_log_helper;
#endif
// The binary name of SRS. // The binary name of SRS.
const char *_srs_binary = NULL; const char *_srs_binary = NULL;
@ -101,8 +103,10 @@ srs_error_t prepare_main()
return srs_error_wrap(err, "srt log initialize"); return srs_error_wrap(err, "srt log initialize");
} }
#ifdef SRS_FFMPEG_FIT
// Disable FFmpeg detail log in utest. // Disable FFmpeg detail log in utest.
_srs_ffmpeg_log_helper.disable_ffmpeg_log(); _srs_ffmpeg_log_helper.disable_ffmpeg_log();
#endif
// Prevent the output of srt logs in utest. // Prevent the output of srt logs in utest.
srt_setloghandler(NULL, srs_srt_utest_null_log_handler); srt_setloghandler(NULL, srs_srt_utest_null_log_handler);