mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 04:56:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/avi/Makefile.am: Added linking to libgstriff-0.9

Browse source 
Original commit message from CVS:
* gst/avi/Makefile.am: (libgstavi_la_LIBADD):
Added linking to libgstriff-0.9
* ext/mad/gstmad.c: (gst_mad_src_query):
check the format of the upstream query and return query if it's the
same format as the requested one.
This commit is contained in:
Edward Hervey 2005-06-30 16:29:39 +00:00
parent 891b270b03
commit f0011b68c8
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2005-06-30 Edward Hervey <edward@fluendo.com>
* gst/avi/Makefile.am: (libgstavi_la_LIBADD):
Added linking to libgstriff-0.9
* ext/mad/gstmad.c: (gst_mad_src_query):
check the format of the upstream query and return query if it's the
same format as the requested one.
2005-06-30 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2005-06-30 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query): * gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query):

12
ext/mad/gstmad.c
View file

@ -552,6 +552,7 @@ gst_mad_src_query (GstPad * pad, GstQuery * query)
case GST_QUERY_POSITION: case GST_QUERY_POSITION:
{ {
GstFormat format; GstFormat format;
GstFormat rformat;
gint64 cur, total, total_bytes; gint64 cur, total, total_bytes;
/* save requested format */ /* save requested format */
@ -563,9 +564,16 @@ gst_mad_src_query (GstPad * pad, GstQuery * query)
GST_LOG_OBJECT (mad, "query on peer pad failed"); GST_LOG_OBJECT (mad, "query on peer pad failed");
goto error; goto error;
} }
/* get the returned format */
gst_query_parse_position (query, &rformat, NULL, &total_bytes);
if (rformat == GST_FORMAT_BYTES)
GST_LOG_OBJECT (mad, "peer pad returned total=%lld bytes", total_bytes);
else if (rformat == GST_FORMAT_TIME)
GST_LOG_OBJECT (mad, "peer pad returned time=%lld", total_bytes);
gst_query_parse_position (query, NULL, NULL, &total_bytes); /* Check if requested format is returned format */
GST_LOG_OBJECT (mad, "peer pad returned total=%lld bytes", total_bytes); if (format == rformat)
return TRUE;
/* and convert to the requested format */ /* and convert to the requested format */
if (format != GST_FORMAT_DEFAULT) { if (format != GST_FORMAT_DEFAULT) {