mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-11 09:55:36 +00:00
x264enc: Replace 'avc-sample' with 'avc' in caps
In the element and in its tests Fixes #606662
This commit is contained in:
parent
48a1935cb0
commit
96ee17e7b6
2 changed files with 3 additions and 4 deletions
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue