From a2eead3d60b1f87c26d9f795a614982be6cb3166 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 22 Oct 2012 11:55:59 +0200 Subject: [PATCH] avi_ fix invert function Fixes https://bugzilla.gnome.org/show_bug.cgi?id=686550 --- gst/avi/gstavidemux.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index f8cdaab..4b118bf 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -4514,12 +4514,10 @@ swap_line (guint8 * d1, guint8 * d2, guint8 * tmp, gint bytes) static GstBuffer * gst_avi_demux_invert (GstAviStream * stream, GstBuffer * buf) { - GstStructure *s; gint y, w, h; gint bpp, stride; guint8 *tmp = NULL; GstMapInfo map; - GstCaps *caps; guint32 fourcc; if (stream->strh->type != GST_RIFF_FCC_vids) @@ -4536,19 +4534,10 @@ gst_avi_demux_invert (GstAviStream * stream, GstBuffer * buf) return buf; /* Ignore non DIB buffers */ } - caps = gst_pad_get_current_caps (stream->pad); - s = gst_caps_get_structure (caps, 0); - gst_caps_unref (caps); - - if (stream->rgb8_palette != NULL) { - bpp = 8; - } else if (!gst_structure_get_int (s, "bpp", &bpp)) { /* FIXME */ - GST_WARNING ("Failed to retrieve depth from caps"); - return buf; - } h = stream->strf.vids->height; w = stream->strf.vids->width; + bpp = stream->strf.vids->bit_cnt ? stream->strf.vids->bit_cnt : 8; stride = GST_ROUND_UP_4 (w * (bpp / 8)); buf = gst_buffer_make_writable (buf); -- 2.7.4