diff options
| author | Jan Schmidt <jan@centricular.com> | 2015-09-27 00:24:17 +1000 |
|---|---|---|
| committer | Jan Schmidt <jan@centricular.com> | 2015-09-27 00:24:17 +1000 |
| commit | a31978643c246f5e671a61b9cfa053f3f6b3870c (patch) | |
| tree | 9155cb6cbe77c0e0651cf8ae9f894fd548daf76f /gst/dvdspu | |
| parent | de568c48966bdb1fca5e499c79403c3884dd44c2 (diff) | |
| download | gstreamer-plugins-bad-a31978643c246f5e671a61b9cfa053f3f6b3870c.tar.gz | |
Revert "dvdspu: handle frame size event from upstream"
This reverts commit 46aaaa6c309b8a8f6e218142fd5944f5d24f095c.
Diffstat (limited to 'gst/dvdspu')
| -rw-r--r-- | gst/dvdspu/gstspu-vobsub.c | 11 | ||||
| -rw-r--r-- | gst/dvdspu/gstspu-vobsub.h | 1 |
2 files changed, 2 insertions, 10 deletions
diff --git a/gst/dvdspu/gstspu-vobsub.c b/gst/dvdspu/gstspu-vobsub.c index 19e8c0027..4f4ccbfe4 100644 --- a/gst/dvdspu/gstspu-vobsub.c +++ b/gst/dvdspu/gstspu-vobsub.c @@ -485,11 +485,6 @@ gstspu_vobsub_handle_dvd_event (GstDVDSpu * dvdspu, GstEvent * event) if (was_forced != forced_only) hl_change = TRUE; } - } else if (strcmp (event_type, "dvd-set-frame-size") == 0) { - gst_structure_get_int (structure, "width", &state->vobsub.frame_w); - gst_structure_get_int (structure, "height", &state->vobsub.frame_h); - GST_INFO_OBJECT (dvdspu, "Frame size is now %dx%d", - state->vobsub.frame_w, state->vobsub.frame_h); } gst_event_unref (event); @@ -514,12 +509,10 @@ gstspu_vobsub_get_render_geometry (GstDVDSpu * dvdspu, } if (display_width) - *display_width = state->vobsub.frame_w > 0 ? - state->vobsub.frame_w : state->info.width; + *display_width = state->info.width; if (display_height) - *display_height = state->vobsub.frame_h > 0 ? - state->vobsub.frame_h : state->info.height; + *display_height = state->info.height; } void diff --git a/gst/dvdspu/gstspu-vobsub.h b/gst/dvdspu/gstspu-vobsub.h index 147d6fb4b..0c8d0f10c 100644 --- a/gst/dvdspu/gstspu-vobsub.h +++ b/gst/dvdspu/gstspu-vobsub.h @@ -56,7 +56,6 @@ struct SpuVobsubState { SpuRect disp_rect; SpuRect hl_rect; - gint frame_w, frame_h; guint32 current_clut[16]; /* Colour lookup table from incoming events */ |