From: Alessandro Decina <alessandro.decina@collabora.co.uk>
Date: Tue, 12 Jul 2011 17:04:27 +0000 (+0200)
Subject: h264parse: remove a check made useless by the last commit
X-Git-Tag: RELEASE-0.10.23~762
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f12598fa644e9dab892a84e551309c074d652a88;p=platform%2Fupstream%2Fgst-plugins-bad.git

h264parse: remove a check made useless by the last commit
---

diff --git a/gst/videoparsers/gsth264parse.c b/gst/videoparsers/gsth264parse.c
index b374b72..089b5a7 100644
--- a/gst/videoparsers/gsth264parse.c
+++ b/gst/videoparsers/gsth264parse.c
@@ -1040,16 +1040,6 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
   /* negotiate with downstream, sets ->format and ->align */
   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) {
     gst_base_parse_set_passthrough (parse, TRUE);
 
@@ -1082,11 +1072,6 @@ wrong_type:
     GST_DEBUG_OBJECT (h264parse, "wrong codec-data type");
     goto refuse_caps;
   }
-unknown_input_format:
-  {
-    GST_DEBUG_OBJECT (h264parse, "unknown stream-format and no codec_data");
-    goto refuse_caps;
-  }
 refuse_caps:
   {
     GST_WARNING_OBJECT (h264parse, "refused caps %" GST_PTR_FORMAT, caps);