summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e70ec7b)
raw | patch | inline | side by side (parent: e70ec7b)
author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | |
Mon, 9 May 2005 15:54:26 +0000 (15:54 +0000) | ||
committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | |
Mon, 9 May 2005 15:54:26 +0000 (15:54 +0000) |
Original commit message from CVS:
* gst/base/gsttypefindhelper.c: (helper_find_peek):
* gst/elements/gsttypefindelement.c: (find_peek):
Handle negative offsets better. Fixes decodebin.
* gst/base/gsttypefindhelper.c: (helper_find_peek):
* gst/elements/gsttypefindelement.c: (find_peek):
Handle negative offsets better. Fixes decodebin.
diff --git a/ChangeLog b/ChangeLog
index b2846604035d107ab532d7334b88a33c458f3aca..7ad1b03b57009fec5c50113127931d44b752841e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
+2005-05-09 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
+ * gst/base/gsttypefindhelper.c: (helper_find_peek):
+ * gst/elements/gsttypefindelement.c: (find_peek):
+ Handle negative offsets better. Fixes decodebin.
+
2005-05-09 Wim Taymans <wim@fluendo.com>
* gst/base/gstbasetransform.c: (gst_base_transform_proxy_getcaps),
index f0805394b98fab60ef2daf229c062e03a28153ac..ecb6f9d0ca4a8811e4050c1efaaa88697fc5516b 100644 (file)
src = find->src;
if (offset < 0) {
- if (find->size == -1)
+ if (find->size == -1 || find->size < -offset)
return NULL;
offset += find->size;
index 5aeece825069559553b8f44f993a22a0fc01d69e..7d424a29e28ab4ea356c4c164ecfad03bfcbb940 100644 (file)
/* FIXME: can we do this easily without querying length? */
guint64 length = find_element_get_length (data);
- if (length == 0) {
+ if (length < -offset) {
buf = NULL;
} else {
buf =
index f0805394b98fab60ef2daf229c062e03a28153ac..ecb6f9d0ca4a8811e4050c1efaaa88697fc5516b 100644 (file)
src = find->src;
if (offset < 0) {
- if (find->size == -1)
+ if (find->size == -1 || find->size < -offset)
return NULL;
offset += find->size;
index 5aeece825069559553b8f44f993a22a0fc01d69e..7d424a29e28ab4ea356c4c164ecfad03bfcbb940 100644 (file)
/* FIXME: can we do this easily without querying length? */
guint64 length = find_element_get_length (data);
- if (length == 0) {
+ if (length < -offset) {
buf = NULL;
} else {
buf =