diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-04 09:36:07 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-04 09:36:07 +0200 |
| commit | 01b9b5002fb057604855dffc9faac4903df4b8d7 (patch) | |
| tree | e6fc518a8dadb3d755e4ee409becba0cd783fee8 /ext/sndfile | |
| parent | 2988a4ccb224f0be59e0b67ca84e88a01bcee8ec (diff) | |
| parent | cc9e4903138894963e52d52dfc22ffb23d763b9c (diff) | |
Merge branch 'master' into 0.11
Conflicts:
common
configure.ac
gst/colorspace/colorspace.c
gst/colorspace/colorspace.h
gst/colorspace/gstcolorspace.c
Diffstat (limited to 'ext/sndfile')
| -rw-r--r-- | ext/sndfile/gstsfsrc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/sndfile/gstsfsrc.c b/ext/sndfile/gstsfsrc.c index f725d3f5b..226f54085 100644 --- a/ext/sndfile/gstsfsrc.c +++ b/ext/sndfile/gstsfsrc.c @@ -200,7 +200,10 @@ gst_sf_src_create (GstBaseSrc * bsrc, guint64 offset, guint length, { GstSFSrc *this; GstBuffer *buf; +/* FIXME discont is set but not used */ +#if 0 gboolean discont = FALSE; +#endif sf_count_t bytes_read; this = GST_SF_SRC (bsrc); @@ -221,7 +224,9 @@ gst_sf_src_create (GstBaseSrc * bsrc, guint64 offset, guint length, goto seek_failed; this->offset = offset; +#if 0 discont = TRUE; +#endif } buf = gst_buffer_new_and_alloc (length); |