diff options
author | Jan Schmidt <jan@centricular.com> | 2016-04-16 23:31:23 +1000 |
---|---|---|
committer | Jan Schmidt <jan@centricular.com> | 2016-04-16 23:31:23 +1000 |
commit | 4f5a6d35176f4fa915d74a418bef52fe49ce8598 (patch) | |
tree | 082a21eb044cdf6d323472cc8f3dd15705775554 | |
parent | 51e1949879e5b21dec9d5ff14a7016a12a4f5430 (diff) | |
download | gstreamer-plugins-good-4f5a6d35176f4fa915d74a418bef52fe49ce8598.tar.gz |
Revert "matroskademux: send custom event with DVD subtitles frame size"
This reverts commit 1c65828968f4b0c7c344bf46606af3404698d444.
Didn't mean to push this patch to 1.6
-rw-r--r-- | gst/matroska/matroska-demux.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index 6005846eb..00b65f7d2 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -50,7 +50,6 @@ #endif #include <math.h> -#include <stdio.h> #include <string.h> #include <glib/gprintf.h> @@ -2668,7 +2667,7 @@ gst_matroska_demux_push_dvd_clut_change_event (GstMatroskaDemux * demux, /* make sure we have terminating 0 */ buf = g_strndup (stream->codec_priv, stream->codec_priv_size); - /* locate and parse palette part */ + /* just locate and parse palette part */ start = strstr (buf, "palette:"); if (start) { gint i; @@ -2715,28 +2714,6 @@ gst_matroska_demux_push_dvd_clut_change_event (GstMatroskaDemux * demux, gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM_STICKY, s)); } } - - /* locate and parse frame size */ - start = strstr (buf, "size:"); - if (start) { - guint width, height; - - start += 5; - while (g_ascii_isspace (*start)) - start++; - - if (sscanf (start, "%ux%u", &width, &height) == 2) { - GstStructure *s; - - s = gst_structure_new ("application/x-gst-dvd-frame-size", - "event", G_TYPE_STRING, "dvd-set-frame-size", - "width", G_TYPE_INT, width, "height", G_TYPE_INT, height, NULL); - - gst_pad_push_event (stream->pad, - gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM_STICKY, s)); - } - } - g_free (buf); } |