summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2008-04-01 14:39:24 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-04-01 14:39:24 +0000
commit2336c35df22f85951cdc5b16752292d55905160e (patch)
tree0fea4c1c8ab7a35b72eaa4f3a7b04c9d169caab6
parent229b4f33d39377571a469afd4e3bf9db21e2b54c (diff)
downloadgstreamer-plugins-ugly-2336c35df22f85951cdc5b16752292d55905160e.tar.gz
gst/asfdemux/gstasfdemux.c: Remove some debug code.
Original commit message from CVS: * gst/asfdemux/gstasfdemux.c: (gst_asf_demux_process_ext_stream_props): Remove some debug code.
-rw-r--r--ChangeLog6
-rw-r--r--gst/asfdemux/gstasfdemux.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 752f12dc..d72a9292 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
* gst/asfdemux/gstasfdemux.c:
(gst_asf_demux_process_ext_stream_props):
+ Remove some debug code.
+
+2008-04-01 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * gst/asfdemux/gstasfdemux.c:
+ (gst_asf_demux_process_ext_stream_props):
Guard against division by 0 and fall back to 25/1 framerate.
2008-04-01 Wim Taymans <wim.taymans@collabora.co.uk>
diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index 21a0e502..135101db 100644
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -2822,7 +2822,7 @@ done:
g_value_init (&framerate, GST_TYPE_FRACTION);
num = GST_SECOND / 100;
- denom = esp.avg_time_per_frame = 0;
+ denom = esp.avg_time_per_frame;
if (denom == 0) {
/* avoid division by 0, assume 25/1 framerate */
denom = GST_SECOND / 2500;