[xiph-commits] r14633 - trunk/ffmpeg2theora

[ivo at svn.xiph.org]

Author: ivo
Date: 2008-03-25 17:19:45 -0700 (Tue, 25 Mar 2008)
New Revision: 14633

Modified:
   trunk/ffmpeg2theora/theorautils.c
Log:
Avoid using x- types per recent discussion in ogg-dev.

Modified: trunk/ffmpeg2theora/theorautils.c
===================================================================
--- trunk/ffmpeg2theora/theorautils.c	2008-03-25 23:47:30 UTC (rev 14632)
+++ trunk/ffmpeg2theora/theorautils.c	2008-03-26 00:19:45 UTC (rev 14633)
@@ -170,7 +170,7 @@
         write64le(op.packet+36, 0); /* start granule */
         write32le(op.packet+44, 0); /* preroll, for theora its 0 */
         *(op.packet+48) = theora_granule_shift (&info->ti); /* granule shift */
-        memcpy(op.packet+FISBONE_SIZE, "Content-Type: video/x-theora\r\n", 30); /* message header field, Content-Type */
+        memcpy(op.packet+FISBONE_SIZE, "Content-Type: video/theora\r\n", 30); /* message header field, Content-Type */
 
         op.b_o_s = 0;
         op.e_o_s = 0;
@@ -197,7 +197,7 @@
         write64le(op.packet+36, 0); /* start granule */
         write32le(op.packet+44, 2); /* preroll, for vorbis its 2 */
         *(op.packet+48) = 0; /* granule shift, always 0 for vorbis */
-        memcpy (op.packet+FISBONE_SIZE, "Content-Type: audio/x-vorbis\r\n", 30);
+        memcpy (op.packet+FISBONE_SIZE, "Content-Type: audio/vorbis\r\n", 30);
         /* Important: Check the case of Content-Type for correctness */
 
         op.b_o_s = 0;