mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-28 03:00:35 +00:00
Code Issues 1 Projects Releases Wiki Activity

x264enc: Read stream-format from the right place

Browse source 
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.
This commit is contained in:
Olivier Crête 2011-07-18 20:41:20 -04:00
parent 7aafba6f82
commit 3cb99f46b7
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ext/x264/gstx264enc.c
View 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 */