From bddac509612362a53a4636dfb53cc9e097f7bf53 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Sun, 24 Apr 2011 16:45:07 -0700
Subject: [PATCH] avimux,matroskamux: Add stream-format to h264 caps

Fixes #606662.
---
 gst/avi/gstavimux.c         | 2 ++
 gst/matroska/matroska-mux.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index 37f9291377..fc8c98639e 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -129,6 +129,8 @@ static GstStaticPadTemplate video_sink_factory =
         "height = (int) [ 16, 4096 ], "
         "framerate = (fraction) [ 0, MAX ]; "
         "video/x-h264, "
+        "stream-format = (string) byte-stream, "
+        "alignment = (string) au, "
         "width = (int) [ 16, 4096 ], "
         "height = (int) [ 16, 4096 ], "
         "framerate = (fraction) [ 0, MAX ]; "
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index 7f94f18718..7fcf943a72 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -102,7 +102,7 @@ static GstStaticPadTemplate videosink_templ =
         "mpegversion = (int) { 1, 2, 4 }, "
         "systemstream = (boolean) false, "
         COMMON_VIDEO_CAPS "; "
-        "video/x-h264, "
+        "video/x-h264, stream-format=avc, alignment=au, "
         COMMON_VIDEO_CAPS "; "
         "video/x-divx, "
         COMMON_VIDEO_CAPS "; "