From 3cb99f46b7b76bc68b77638a00d154f1a2ee9adf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Mon, 18 Jul 2011 20:41:20 -0400 Subject: [PATCH] x264enc: Read stream-format from the right place Read the stream-format from "stream-format" and not from profile, also rename the "bytestream" variable to "stream_format" so it's easier to understand. --- ext/x264/gstx264enc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index f8cde40f8a..30d0b906dc 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -1581,7 +1581,7 @@ gst_x264_enc_sink_set_caps (GstPad * pad, GstCaps * caps) GstStructure *s; const gchar *profile; const gchar *level; - const gchar *bytestream; + const gchar *stream_format; if (gst_caps_is_empty (allowed_caps)) { gst_caps_unref (allowed_caps); @@ -1647,12 +1647,12 @@ gst_x264_enc_sink_set_caps (GstPad * pad, GstCaps * caps) } } - bytestream = gst_structure_get_string (s, "stream-format"); + stream_format = gst_structure_get_string (s, "stream-format"); encoder->current_byte_stream = GST_X264_ENC_STREAM_FORMAT_FROM_PROPERTY; - if (bytestream) { - if (!strcmp (bytestream, "avc")) { + if (stream_format) { + if (!strcmp (stream_format, "avc")) { encoder->current_byte_stream = GST_X264_ENC_STREAM_FORMAT_AVC; - } else if (!strcmp (profile, "byte-stream")) { + } else if (!strcmp (stream_format, "byte-stream")) { encoder->current_byte_stream = GST_X264_ENC_STREAM_FORMAT_BYTE_STREAM; } else { /* means we have both in caps and _FROM_PROPERTY should be the option */