Merge branch 'upstream-experimental' into upstream

1 files changed, 15 insertions, 2 deletions

diff --git a/gst/asfdemux/asfheaders.c b/gst/asfdemux/asfheaders.c
index ae07639..f1488be 100644
--- a/gst/asfdemux/asfheaders.c
+++ b/gst/asfdemux/asfheaders.c
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include <gst/gst.h>
@@ -30,6 +30,8 @@ const ASFGuidHash asf_payload_ext_guids[] = {
   {ASF_PAYLOAD_EXTENSION_SYSTEM_PIXEL_ASPECT_RATIO,
         "ASF_PAYLOAD_EXTENSION_SYSTEM_PIXEL_ASPECT_RATIO",
       {0x1b1ee554, 0x4bc8f9ea, 0x6b371a82, 0xb8c4e474}},
+  {ASF_PAYLOAD_EXTENSION_TIMING, "ASF_PAYLOAD_EXTENSION_TIMING",
+      {0XFD3CC02A, 0X4CFA06DB, 0X12721C80, 0XE44587D3}},
   {ASF_PAYLOAD_EXTENSION_UNDEFINED, "ASF_PAYLOAD_EXTENSION_UNDEFINED",
         {0, 0, 0, 0}
       }
@@ -58,11 +60,22 @@ const ASFGuidHash asf_stream_guids[] = {
   {ASF_STREAM_AUDIO, "ASF_STREAM_AUDIO",
         {0xF8699E40, 0x11CF5B4D, 0x8000FDA8, 0x2B445C5F}
       },
+  {ASF_STREAM_EXT_EMBED_HEADER, "ASF_STREAM_EXT_EMBED_HEADER",
+      {0X3AFB65E2, 0X40F247EF, 0XA9702CAC, 0X43D3710D}},
   {ASF_STREAM_UNDEFINED, "ASF_STREAM_UNDEFINED",
         {0, 0, 0, 0}
       }
 };
 
+const ASFGuidHash asf_ext_stream_guids[] = {
+  {ASF_EXT_STREAM_AUDIO, "ASF_EXT_STREAM_AUDIO",
+        {0X31178C9D, 0X452803E1, 0XF93D82B5, 0X03F522DB}
+      },
+  {ASF_EXT_STREAM_UNDEFINED, "ASF_EXT_STREAM_UNDEFINED",
+        {0, 0, 0, 0}
+      }
+};
+
 const ASFGuidHash asf_object_guids[] = {
   {ASF_OBJ_STREAM, "ASF_OBJ_STREAM",
         {0xB7DC0791, 0x11CFA9B7, 0xC000E68E, 0x6553200C}