diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gst/avi/gstavidemux.c | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2005-08-09 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + + * 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. + 2005-08-08 Tim-Philipp Müller <tim at centricular dot net> * ext/faad/gstfaad.c: (gst_faad_base_init), (gst_faad_class_init), 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; } |