summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorThiago Santos <thiago.sousa.santos@collabora.co.uk>2010-02-22 19:24:06 -0300
committerThiago Santos <thiago.sousa.santos@collabora.co.uk>2010-03-01 17:59:10 -0300
commit55e2adda3770a320e3765ca93777fbf74bcc2ded (patch)
tree3b07510385bc4d66e3528195feaf214359eac6f8 /gst
parentccab6f45a0a7242207b9ebda24b8f7355f14e11e (diff)
h264parse: Replace 'avc-sample' with 'avc' in caps
Fixes #606662
Diffstat (limited to 'gst')
-rw-r--r--gst/h264parse/gsth264parse.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gst/h264parse/gsth264parse.c b/gst/h264parse/gsth264parse.c
index d8f1e55fd..66458ae58 100644
--- a/gst/h264parse/gsth264parse.c
+++ b/gst/h264parse/gsth264parse.c
@@ -1168,7 +1168,7 @@ static guint
gst_h264_parse_parse_stream_format (GstH264Parse * h264parse,
const gchar * stream_format)
{
- if (strcmp (stream_format, "avc-sample") == 0) {
+ if (strcmp (stream_format, "avc") == 0) {
return GST_H264_PARSE_FORMAT_SAMPLE;
} else if (strcmp (stream_format, "byte-stream") == 0) {
return GST_H264_PARSE_FORMAT_BYTE;
@@ -1269,12 +1269,12 @@ gst_h264_parse_update_src_caps (GstH264Parse * h264parse, GstCaps * caps)
if (stream_format == NULL) {
gst_structure_remove_field (structure, "stream-format");
if (h264parse->format == GST_H264_PARSE_FORMAT_SAMPLE) {
- stream_format = "avc-sample";
+ stream_format = "avc";
} else if (h264parse->format == GST_H264_PARSE_FORMAT_BYTE) {
stream_format = "byte-stream";
} else {
if (h264parse->packetized) {
- stream_format = "avc-sample";
+ stream_format = "avc";
} else {
stream_format = "byte-stream";
}