Merge pull request #32 from Matroska-Org/new-aes-elements

author Moritz Bunkus <moritz@bunkus.org>

Mon, 22 Jun 2020 07:33:17 +0000 (09:33 +0200)

committer GitHub <noreply@github.com>

Mon, 22 Jun 2020 07:33:17 +0000 (09:33 +0200)
author Moritz Bunkus <moritz@bunkus.org>
Mon, 22 Jun 2020 07:33:17 +0000 (09:33 +0200)
committer GitHub <noreply@github.com>
Mon, 22 Jun 2020 07:33:17 +0000 (09:33 +0200)
diff --cc matroska/KaxSemantic.h
Simple merge
diff --cc src/KaxSemantic.cpp
Simple merge
author	Moritz Bunkus <moritz@bunkus.org>
	Mon, 22 Jun 2020 07:33:17 +0000 (09:33 +0200)
committer	GitHub <noreply@github.com>
	Mon, 22 Jun 2020 07:33:17 +0000 (09:33 +0200)
		1	2
matroska/KaxSemantic.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/KaxSemantic.cpp	patch \|	diff1 \|	diff2 \|	blob \| history