From 21b8eaeab523e6b71d885ea0f5052180472b1ed0 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 14 Jul 2006 16:42:20 +0000 Subject: [PATCH] Revert fix for regression in #347408 after release. Original commit message from CVS: * libs/gst/base/gstbasesrc.c: (gst_base_src_update_length): * tests/check/elements/filesrc.c: (GST_START_TEST): Revert fix for regression in #347408 after release. --- ChangeLog | 6 ++++++ libs/gst/base/gstbasesrc.c | 4 ---- tests/check/elements/filesrc.c | 2 -- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1780749ecd..9196634e70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-07-14 Wim Taymans + + * libs/gst/base/gstbasesrc.c: (gst_base_src_update_length): + * tests/check/elements/filesrc.c: (GST_START_TEST): + Revert fix for regression in #347408 after release. + 2006-07-14 Tim-Philipp Müller Patch by: Antoine Tremblay diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c index 725e89291f..3c961beb5c 100644 --- a/libs/gst/base/gstbasesrc.c +++ b/libs/gst/base/gstbasesrc.c @@ -1238,10 +1238,6 @@ gst_base_src_update_length (GstBaseSrc * src, guint64 offset, guint * length) *length = maxsize - offset; } } - /* FIXME, remove this check after release. Some elements pull 0 bytes - * and expect an UNEXPECTED return value (id3demux) */ - if (*length == 0) - goto unexpected_length; /* keep track of current position. segment is in bytes, we checked * that above. */ diff --git a/tests/check/elements/filesrc.c b/tests/check/elements/filesrc.c index 2ec7b5d15f..bb4a3fd32b 100644 --- a/tests/check/elements/filesrc.c +++ b/tests/check/elements/filesrc.c @@ -186,14 +186,12 @@ GST_START_TEST (test_pull) fail_unless (GST_BUFFER_SIZE (buffer1) == 10); gst_buffer_unref (buffer1); -#if 0 /* enable after 0 bytes pulls are fixed */ /* read 0 bytes at end-1 should return 0 bytes */ ret = gst_pad_get_range (pad, stop - 1, 0, &buffer1); fail_unless (ret == GST_FLOW_OK); fail_unless (buffer1 != NULL); fail_unless (GST_BUFFER_SIZE (buffer1) == 0); gst_buffer_unref (buffer1); -#endif /* read 10 bytes at end-1 should return 1 byte */ ret = gst_pad_get_range (pad, stop - 1, 10, &buffer1);