mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 00:36:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/avi/gstavidemux.c: Mixing binary and logical operators is not going to work; fix position-querying in Totem.

Browse source 
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.
This commit is contained in:
Ronald S. Bultje 2005-08-09 12:22:12 +00:00
parent 1b806af1a6
commit 0d1f52616a
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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),

4
gst/avi/gstavidemux.c
View file

@ -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;
}