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

h264parse: remove a check made useless by the last commit

Browse source
This commit is contained in:
Alessandro Decina 2011-07-12 19:04:27 +02:00 committed by Alessandro Decina
parent 5f6a805dfd
commit f12598fa64
1 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst/videoparsers/gsth264parse.c
View file

@ -1040,16 +1040,6 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
/* negotiate with downstream, sets ->format and ->align */ /* negotiate with downstream, sets ->format and ->align */
gst_h264_parse_negotiate (h264parse); gst_h264_parse_negotiate (h264parse);
/* if upstream sets codec_data without setting stream-format and alignment, we
* assume stream-format=avc,alignment=au */
if (format == GST_H264_PARSE_FORMAT_NONE) {
if (codec_data == NULL)
goto unknown_input_format;
format = GST_H264_PARSE_FORMAT_AVC;
align = GST_H264_PARSE_ALIGN_AU;
}
if (format == h264parse->format && align == h264parse->align) { if (format == h264parse->format && align == h264parse->align) {
gst_base_parse_set_passthrough (parse, TRUE); gst_base_parse_set_passthrough (parse, TRUE);
@ -1082,11 +1072,6 @@ wrong_type:
GST_DEBUG_OBJECT (h264parse, "wrong codec-data type"); GST_DEBUG_OBJECT (h264parse, "wrong codec-data type");
goto refuse_caps; goto refuse_caps;
} }
unknown_input_format:
{
GST_DEBUG_OBJECT (h264parse, "unknown stream-format and no codec_data");
goto refuse_caps;
}
refuse_caps: refuse_caps:
{ {
GST_WARNING_OBJECT (h264parse, "refused caps %" GST_PTR_FORMAT, caps); GST_WARNING_OBJECT (h264parse, "refused caps %" GST_PTR_FORMAT, caps);