From 0d1f52616a6ad52986b5247ff94f071ebb23e925 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 9 Aug 2005 12:22:12 +0000 Subject: gst/avi/gstavidemux.c: Mixing binary and logical operators is not going to work; fix position-querying in Totem. Original commit message from CVS: * gst/avi/gstavidemux.c: (gst_avi_demux_process_next_entry): Mixing binary and logical operators is not going to work; fix position-querying in Totem. --- gst/avi/gstavidemux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gst') diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 248ed869..b37d0d73 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -2020,8 +2020,8 @@ gst_avi_demux_process_next_entry (GstAviDemux * avi) GST_TIME_FORMAT " on pad %s", GST_BUFFER_SIZE (buf), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)), gst_pad_get_name (stream->pad)); - if (!((res = gst_pad_push (stream->pad, buf)) & (GST_FLOW_OK - || GST_FLOW_NOT_LINKED))) + if ((res = gst_pad_push (stream->pad, buf)) != GST_FLOW_OK && + res != GST_FLOW_NOT_LINKED) return res; processed = TRUE; } -- cgit