avimux,matroskamux: Add stream-format to h264 caps

Fixes #606662.

diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index 37f929137727588b9972047f25cb78e882bf7d9a..fc8c98639e8247ff1d36b9b6bb2f11e3aac76b23 100644 (file)
--- 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 7f94f187182664e3f607739187340c8d2fe4c724..7fcf943a720e1b6c2e473760984ec47b653bede1 100644 (file)
--- 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 "; "