Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Do not use avformat network

Browse source 
Scrcpy does not use FFmpeg network features. Initialize network locally
instead (useful only for Windows).

The include block has been moved to fix the following warning:

    Please include winsock2.h before windows.h
This commit is contained in:
Romain Vimont 2023-02-27 20:03:04 +01:00
parent 0702be86d8
commit 8e8b039a63
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main.c
View file

@ -4,10 +4,6 @@
#include <stdbool.h> #include <stdbool.h>
#include <unistd.h> #include <unistd.h>
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#ifdef _WIN32
#include <windows.h>
#include "util/str.h"
#endif
#ifdef HAVE_V4L2 #ifdef HAVE_V4L2
# include <libavdevice/avdevice.h> # include <libavdevice/avdevice.h>
#endif #endif
@ -19,8 +15,14 @@
#include "scrcpy.h" #include "scrcpy.h"
#include "usb/scrcpy_otg.h" #include "usb/scrcpy_otg.h"
#include "util/log.h" #include "util/log.h"
#include "util/net.h"
#include "version.h" #include "version.h"
#ifdef _WIN32
#include <windows.h>
#include "util/str.h"
#endif
int int
main_scrcpy(int argc, char *argv[]) { main_scrcpy(int argc, char *argv[]) {
#ifdef _WIN32 #ifdef _WIN32
@ -69,7 +71,7 @@ main_scrcpy(int argc, char *argv[]) {
} }
#endif #endif
if (avformat_network_init()) { if (!net_init()) {
return SCRCPY_EXIT_FAILURE; return SCRCPY_EXIT_FAILURE;
} }
@ -80,8 +82,6 @@ main_scrcpy(int argc, char *argv[]) {
enum scrcpy_exit_code ret = scrcpy(&args.opts); enum scrcpy_exit_code ret = scrcpy(&args.opts);
#endif #endif
avformat_network_deinit(); // ignore failure
return ret; return ret;
} }