diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-08-09 12:22:12 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-08-09 12:22:12 +0000 |
| commit | 0d1f52616a6ad52986b5247ff94f071ebb23e925 (patch) | |
| tree | 70cbbb86f3d96d6d57f2eb4f3d5a75e8a5cdba95 /gst/avi | |
| parent | 1b806af1a6356ab4c18e9d26bc3d78825a679597 (diff) | |
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.
Diffstat (limited to 'gst/avi')
| -rw-r--r-- | gst/avi/gstavidemux.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |