summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Ziegler <austin@zieglers.ca>2013-08-13 23:48:50 -0400
committerAustin Ziegler <austin@zieglers.ca>2013-08-13 23:48:50 -0400
commit2d875a514701c6a0c8b74a125075681d07a33d2c (patch)
treee075ec2a7374b1fe4296ed2ddc11931907d8e73f
parent2df4c54f9601b83712d1dc9d9905cba2ccefaa56 (diff)
downloadgit-2d875a514701c6a0c8b74a125075681d07a33d2c.tar.gz
Finishing IANA updates.
-rw-r--r--History.rdoc2
-rw-r--r--lib/mime/types/video2
2 files changed, 4 insertions, 0 deletions
diff --git a/History.rdoc b/History.rdoc
index c15d2eb1d0..8d16f99b94 100644
--- a/History.rdoc
+++ b/History.rdoc
@@ -24,6 +24,8 @@
* application/vnd.etsi.pstn\+xml from Han and Belling.
* application/vnd.fujixerox.docuworks.container from Tashiro.
* application/vnd.windows.devicepairing from Dandawate.
+ * video/vnd.radgamettools.bink and video/vnd.radgamettools.smacker from
+ Andersson.
* Updated MIME Types:
* RFC 6960 was adopted (application/ocsp-request and application/ocsp-response).
diff --git a/lib/mime/types/video b/lib/mime/types/video
index 790e52cf44..2dfdb825fd 100644
--- a/lib/mime/types/video
+++ b/lib/mime/types/video
@@ -65,6 +65,8 @@ video/vnd.ms-playready.media.pyv 'IANA,[DiAcetis]
video/vnd.nokia.interleaved-multimedia @nim 'IANA,[Kangaslampi]
video/vnd.nokia.videovoip 'IANA,[Nokia]
video/vnd.objectvideo @mp4,m4v 'IANA,[Clark]
+video/vnd.radgamettools.bink 'IANA,[Andersson]
+video/vnd.radgamettools.smacker 'IANA,[Andersson]
video/vnd.sealed.mpeg1 @s11 'IANA,[Petersen]
video/vnd.sealed.mpeg4 @smpg,s14 'IANA,[Petersen]
video/vnd.sealed.swf @sswf,ssw 'IANA,[Petersen]