x264enc: Read stream-format from the right place
authorOlivier CrĂȘte <olivier.crete@collabora.com>
Tue, 19 Jul 2011 00:41:20 +0000 (20:41 -0400)
committerNikhil Devshatwar <a0132237@ti.com>
Fri, 17 May 2013 09:40:35 +0000 (15:10 +0530)
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

index f8cde40f8a8d88b1e1dac50a91bf767ac7e91eb5..30d0b906dcfad9e15ab21e9d1ca301c03892399a 100644 (file)
@@ -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 */