summaryrefslogtreecommitdiff
path: root/gst/flx
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2005-12-13 10:45:04 +0000
committerEdward Hervey <bilboed@bilboed.com>2005-12-13 10:45:04 +0000
commitf5b7ab5af12e71000e85074205fb3c0ff5e3bc0b (patch)
tree5fb67eddea9a269e9fad871e8ea601fc30d719f5 /gst/flx
parentea9090e73fada2f174319b901ec39c4a042992d6 (diff)
gst/flx/gstflxdec.c: If the speed of the file is null in the header, set the frame_time to the default setting of GST...
Original commit message from CVS: * gst/flx/gstflxdec.c: (gst_flxdec_chain): If the speed of the file is null in the header, set the frame_time to the default setting of GST_SECOND / 70. Which is the default frame_delay for .fli files as stated in this document : http://www.compuphase.com/flic.htm Would be nice to have the time conversion done properly too (duration = flxh->frames * flxdec->frame_time)
Diffstat (limited to 'gst/flx')
-rw-r--r--gst/flx/gstflxdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c
index 0e6a9dd98..06f7ec4f2 100644
--- a/gst/flx/gstflxdec.c
+++ b/gst/flx/gstflxdec.c
@@ -492,6 +492,8 @@ gst_flxdec_chain (GstPad * pad, GstBuffer * buf)
if (flxh->type == FLX_MAGICHDR_FLI) {
flxdec->frame_time = JIFFIE * flxh->speed;
+ } else if (flxh->speed == 0) {
+ flxdec->frame_time = GST_SECOND / 70;
} else {
flxdec->frame_time = flxh->speed * GST_MSECOND;
}