From 96ee17e7b688d1dc021b56efc91de490b9d9583f Mon Sep 17 00:00:00 2001 From: Thiago Santos Date: Mon, 22 Feb 2010 19:13:11 -0300 Subject: [PATCH] x264enc: Replace 'avc-sample' with 'avc' in caps In the element and in its tests Fixes #606662 --- ext/x264/gstx264enc.c | 5 ++--- tests/check/elements/x264enc.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index 7d545d514c..ffd97ab298 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -223,7 +223,7 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_CAPS ("video/x-h264, " "framerate = (fraction) [0/1, MAX], " "width = (int) [ 1, MAX ], " "height = (int) [ 1, MAX ], " - "stream-format = (string) { byte-stream, avc-sample }") + "stream-format = (string) { byte-stream, avc }") ); static void gst_x264_enc_finalize (GObject * object); @@ -819,8 +819,7 @@ gst_x264_enc_set_src_caps (GstX264Enc * encoder, GstPad * pad, GstCaps * caps) gst_caps_set_simple (outcaps, "codec_data", GST_TYPE_BUFFER, buf, NULL); gst_buffer_unref (buf); } - gst_structure_set (structure, "stream-format", G_TYPE_STRING, "avc-sample", - NULL); + gst_structure_set (structure, "stream-format", G_TYPE_STRING, "avc", NULL); } else { gst_structure_set (structure, "stream-format", G_TYPE_STRING, "byte-stream", NULL); diff --git a/tests/check/elements/x264enc.c b/tests/check/elements/x264enc.c index 60d46e0369..c256f4e385 100644 --- a/tests/check/elements/x264enc.c +++ b/tests/check/elements/x264enc.c @@ -97,7 +97,7 @@ check_caps (GstCaps * caps) fail_unless (G_VALUE_HOLDS_STRING (sf)); stream_format = g_value_get_string (sf); fail_unless (stream_format != NULL); - if (strcmp (stream_format, "avc-sample") == 0) { + if (strcmp (stream_format, "avc") == 0) { const guint8 *data; GstBuffer *buf;