aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2023-06-24 17:49:24 +0200
committerHugo Hörnquist <hugo@lysator.liu.se>2023-06-24 17:49:24 +0200
commite739f4d0e09b8d6eb5064275945583df4b0786f0 (patch)
tree4720c1dbc7b0e8532206fd0a4d74a8712e0a26da
parentmån 19 jun 2023 20:02:06 CEST (diff)
downloadwiki-public-e739f4d0e09b8d6eb5064275945583df4b0786f0.tar.gz
wiki-public-e739f4d0e09b8d6eb5064275945583df4b0786f0.tar.xz
lör 24 jun 2023 17:49:24 CEST
-rw-r--r--IP addresses for documentation.wiki9
-rw-r--r--ffmpeg.wiki5
-rw-r--r--index.wiki3
-rw-r--r--wireshark.wiki7
4 files changed, 24 insertions, 0 deletions
diff --git a/IP addresses for documentation.wiki b/IP addresses for documentation.wiki
new file mode 100644
index 0000000..04303f3
--- /dev/null
+++ b/IP addresses for documentation.wiki
@@ -0,0 +1,9 @@
+%title IP Addresses Reserved for Documentation
+
+- `192.0.2.0/24` [[RFC:5737]]
+- `198.51.100.0/24` [[RFC:5737]]
+- `203.0.113.0/24` [[RFC:5737]]
+- `233.252.0.0/24` (for multicast) [[RFC:5771]] [[RFC:6676]]
+- `2001:db8::/32` [[RFC:3879]] (may contain multicast, see [[RFC:6676]])
+
+Also see [[RFC:5771]] for further special blocks.
diff --git a/ffmpeg.wiki b/ffmpeg.wiki
index f7f0ab7..b9d67f1 100644
--- a/ffmpeg.wiki
+++ b/ffmpeg.wiki
@@ -9,6 +9,11 @@ Add subtitles to file
ffmpeg -i *.mp4 -i *.srt -c copy out.mkv
}}}
+Add cover art to mkv file
+{{{sh
+ffmpeg -i input.mkv -c copy -attach cover-art.png -metadata:s:t mimetype=image/png output.mkv
+}}}
+
--------------------------------------------------
{{{sh
diff --git a/index.wiki b/index.wiki
index 10f8be6..675bdcd 100644
--- a/index.wiki
+++ b/index.wiki
@@ -1,3 +1,5 @@
+%title Public Wiki
+
[[wn.private:index|Private pages]]
= Top Heading =
@@ -109,6 +111,7 @@
- [[ldap]]
- [[losetup]]
- [[rv290]]
+- [[IP addresses for documentation]]
* [[diary/diary|Dagbok]]
diff --git a/wireshark.wiki b/wireshark.wiki
index c9c2aa4..3309d07 100644
--- a/wireshark.wiki
+++ b/wireshark.wiki
@@ -1,2 +1,9 @@
+%title Wireshark
+
+== Intercept encrypted trafic ==
+
https://stackoverflow.com/questions/18456934/how-to-view-encrypted-application-data-in-wireshark
+
+{{{sh
export SSLKEYLOGFILE=/tmp/ssl-key.log
+}}}