diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-07-01 09:32:42 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-07-01 09:32:42 +0100 |
| commit | f6a12114953214d65560b084197362e814376d17 (patch) | |
| tree | d186ae0e3b70d8b58a75f6c09e1ec5a8317db27c | |
| parent | ae27524be0addc62232896cd64dfb4be0f1e1057 (diff) | |
Revert "qtdemux: Make sure we don't blacklist streams by wrongly comparing their"
This reverts commit 5503a59a5779b67451d8a271000181790ee76bc7.
Reverting this since it causes regressions with a lot of sample files
I have, all of which worked fine with the last -good release (#586891).
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 7142c2923..eafaef8f7 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -3975,14 +3975,14 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak) guint64 tdur1, tdur2; /* don't overflow */ - tdur1 = stream->timescale * (guint64) stream->duration; - tdur2 = qtdemux->timescale * (guint64) qtdemux->duration; + tdur1 = stream->timescale * (guint64) qtdemux->duration; + tdur2 = qtdemux->timescale * (guint64) stream->duration; /* HACK: * some of those trailers, nowadays, have prologue images that are * themselves vide tracks as well. I haven't really found a way to * identify those yet, except for just looking at their duration. */ - if (tdur2 != 0 && (tdur1 * 10 / tdur2) < 2) { + if (tdur1 != 0 && (tdur2 * 10 / tdur1) < 2) { GST_WARNING_OBJECT (qtdemux, "Track shorter than 20%% (%" G_GUINT64_FORMAT "/%" G_GUINT32_FORMAT " vs. %" G_GUINT32_FORMAT "/%" G_GUINT32_FORMAT ") of the stream " |