avfilter/vf_ssim: remove unnecessary check

[ffmpeg] / libavformat / librist.c

diff --git a/libavformat/librist.c b/libavformat/librist.c
index 3f74521cb47c68e178d7b1986ca369a29a4ffd8a..01a3f9c122a3897e50ebcc29c22a96daf1492122 100644 (file)
--- a/libavformat/librist.c
+++ b/libavformat/librist.c
@@ -62,9 +62,9 @@ static const AVOption librist_options[] = {
     { "simple",      NULL,              0,                   AV_OPT_TYPE_CONST, {.i64=RIST_PROFILE_SIMPLE},   0, 0, .flags = D|E, "profile" },
     { "main",        NULL,              0,                   AV_OPT_TYPE_CONST, {.i64=RIST_PROFILE_MAIN},     0, 0, .flags = D|E, "profile" },
     { "advanced",    NULL,              0,                   AV_OPT_TYPE_CONST, {.i64=RIST_PROFILE_ADVANCED}, 0, 0, .flags = D|E, "profile" },
-    { "buffer_size", "set buffer_size", OFFSET(buffer_size), AV_OPT_TYPE_INT,   {.i64=0},                     0, INT_MAX, .flags = D|E },
+    { "buffer_size", "set buffer_size in ms", OFFSET(buffer_size), AV_OPT_TYPE_INT, {.i64=0},                 0, 30000, .flags = D|E },
     { "pkt_size",    "set packet size", OFFSET(packet_size), AV_OPT_TYPE_INT,   {.i64=1316},                  1, MAX_PAYLOAD_SIZE,    .flags = D|E },
-    { "log_level",   "set loglevel",    OFFSET(log_level),   AV_OPT_TYPE_INT,   {.i64=-1},                   -1, INT_MAX, .flags = D|E },
+    { "log_level",   "set loglevel",    OFFSET(log_level),   AV_OPT_TYPE_INT,   {.i64=RIST_LOG_INFO},        -1, INT_MAX, .flags = D|E },
     { "secret", "set encryption secret",OFFSET(secret),      AV_OPT_TYPE_STRING,{.str=NULL},                  0, 0,       .flags = D|E },
     { "encryption","set encryption type",OFFSET(encryption), AV_OPT_TYPE_INT   ,{.i64=0},                     0, INT_MAX, .flags = D|E },
     { NULL }
@@ -87,12 +87,11 @@ static int log_cb(void *arg, enum rist_log_level log_level, const char *msg)
     switch (log_level) {
     case RIST_LOG_ERROR:    level = AV_LOG_ERROR;   break;
     case RIST_LOG_WARN:     level = AV_LOG_WARNING; break;
-    case RIST_LOG_NOTICE:   level = AV_LOG_VERBOSE; break;
-    case RIST_LOG_INFO:     level = AV_LOG_INFO;    break;
+    case RIST_LOG_NOTICE:   level = AV_LOG_INFO;    break;
+    case RIST_LOG_INFO:     level = AV_LOG_VERBOSE; break;
     case RIST_LOG_DEBUG:    level = AV_LOG_DEBUG;   break;
     case RIST_LOG_DISABLE:  level = AV_LOG_QUIET;   break;
-    case RIST_LOG_SIMULATE: level = AV_LOG_TRACE;   break;
-    default: level = AV_LOG_PANIC;
+    default: level = AV_LOG_WARNING;
     }
 
     av_log(arg, level, "%s", msg);
@@ -158,7 +157,7 @@ static int librist_open(URLContext *h, const char *uri, int flags)
     }
 
     if (s->secret && peer_config->secret[0] == 0)
-        av_strlcpy(peer_config->secret, s->secret, FFMIN(RIST_MAX_STRING_SHORT - 1, strlen(s->secret)));
+        av_strlcpy(peer_config->secret, s->secret, RIST_MAX_STRING_SHORT);
 
     if (s->secret && (s->encryption == 128 || s->encryption == 256))
         peer_config->key_size = s->encryption;