Merge branch 'master' into dev

2019-12-09 22:37:20 +01:00
parent 024c2f7e6b 684e0abb74
commit 242e57d69b
5 changed files with 592 additions and 10 deletions
--- a/app/src/scrcpy.h
+++ b/app/src/scrcpy.h
@@ -42,7 +42,7 @@ struct scrcpy_options {
    .push_target = NULL, \
    .record_format = RECORDER_FORMAT_AUTO, \
    .port = DEFAULT_LOCAL_PORT, \
-    .max_size = DEFAULT_LOCAL_PORT, \
+    .max_size = DEFAULT_MAX_SIZE, \
    .bit_rate = DEFAULT_BIT_RATE, \
    .max_fps = 0, \
    .window_x = -1, \