summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2005-11-28 17:31:44 +0000
committerEdward Hervey <bilboed@bilboed.com>2005-11-28 17:31:44 +0000
commit735b60acf6d74ea77d11206ca66f70fa17f263bf (patch)
treeb221488399d9454b576fc8456756f1117aedeaf6
parent804aff8689af9e75299f54b574e7cce42482deff (diff)
gst/avi/gstavidemux.c: Useless check now we're setting the current entry correctly.
Original commit message from CVS: * gst/avi/gstavidemux.c: (gst_avi_demux_process_next_entry): Useless check now we're setting the current entry correctly.
-rw-r--r--ChangeLog5
-rw-r--r--gst/avi/gstavidemux.c6
2 files changed, 5 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index da57719b..55197cc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-28 Edward Hervey <edward@fluendo.com>
+
+ * gst/avi/gstavidemux.c: (gst_avi_demux_process_next_entry):
+ Useless check now we're setting the current entry correctly.
+
2005-11-28 Tim-Philipp Müller <tim at centricular dot net>
* ext/jpeg/gstjpegenc.c: (gst_jpegenc_resync), (gst_jpegenc_chain),
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 153409ed..b27e15d8 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -2116,12 +2116,6 @@ gst_avi_demux_process_next_entry (GstAviDemux * avi)
GST_DEBUG_OBJECT (avi, "Skipping entry %d (%d, %p)",
avi->current_entry - 1, entry->size, stream->pad);
goto next;
- } else if (GST_CLOCK_TIME_IS_VALID (avi->segment_start)) {
- if (stream->strh->type != GST_RIFF_FCC_vids &&
- entry->ts < avi->segment_start) {
- GST_DEBUG_OBJECT (avi, "Doing keyframe sync");
- goto next;
- }
}
if ((res = gst_pad_pull_range (avi->sinkpad, entry->offset +