diff options
author | Dave Robillard <dave@drobilla.net> | 2009-07-10 20:40:11 -0400 |
---|---|---|
committer | Dave Robillard <dave@drobilla.net> | 2009-07-10 20:40:11 -0400 |
commit | ba89c9e518ded3d919461903a444799a5115c34f (patch) | |
tree | 4b5429dcf1cdb5fe63b214d771d4ad76109ef099 /ext/mimic/gstmimdec.c | |
parent | caba48f261421d397900471b19350da2e5a4a4e5 (diff) | |
parent | d607daaf183eb3e068ec53bbf373ea3a63991aa9 (diff) | |
download | gst-plugins-bad-ba89c9e518ded3d919461903a444799a5115c34f.tar.gz gst-plugins-bad-ba89c9e518ded3d919461903a444799a5115c34f.tar.bz2 gst-plugins-bad-ba89c9e518ded3d919461903a444799a5115c34f.zip |
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Diffstat (limited to 'ext/mimic/gstmimdec.c')
-rw-r--r-- | ext/mimic/gstmimdec.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ext/mimic/gstmimdec.c b/ext/mimic/gstmimdec.c index c7f1ec87..1579bd41 100644 --- a/ext/mimic/gstmimdec.c +++ b/ext/mimic/gstmimdec.c @@ -172,7 +172,7 @@ gst_mimdec_chain (GstPad * pad, GstBuffer * in) (mimdec->have_header ? mimdec->payload_size : 24)) { if (!mimdec->have_header) { header = (guchar *) gst_adapter_peek (mimdec->adapter, 24); - header_size = GUINT16_FROM_LE (*(guint16 *) (header + 0)); + header_size = header[0]; if (header_size != 24) { GST_WARNING_OBJECT (mimdec, "invalid frame: header size %d incorrect", header_size); @@ -201,6 +201,12 @@ gst_mimdec_chain (GstPad * pad, GstBuffer * in) mimdec->have_header = TRUE; } + /* Check if its paused frame, drop it */ + if (mimdec->payload_size == 0) { + mimdec->have_header = FALSE; + continue; + } + if (gst_adapter_available (mimdec->adapter) < mimdec->payload_size) { goto out; } |