diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-17 16:01:53 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-17 16:01:53 +0000 |
| commit | 896d352d7c65545d648805885d54f7b10c17329c (patch) | |
| tree | 53411bc9808f67ffe9fad2590a1f77103c0eb010 /src/input | |
| parent | e80b58148fe11ba0770e6e2927faca06d6408574 (diff) | |
| parent | e886af1e544dc7db4abad76bdb14fe53a5467ced (diff) | |
| download | xine-lib-896d352d7c65545d648805885d54f7b10c17329c.tar.gz xine-lib-896d352d7c65545d648805885d54f7b10c17329c.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libfaad/Makefile.am => contrib/libfaad/Makefile.am
rename : src/libxineadec/Makefile.am => src/audio_dec/Makefile.am
rename : src/libxinevdec/Makefile.am => src/video_dec/Makefile.am
rename : src/libxinevdec/image.c => src/video_dec/image.c
rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am
rename : src/libmpeg2new/Makefile.am => src/video_dec/libmpeg2new/Makefile.am
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/Makefile.am | 1 | ||||
| -rw-r--r-- | src/input/input_pvr.c | 7 | ||||
| -rw-r--r-- | src/input/vcd/Makefile.am | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am index 1fc5d1a39..ddeb61a06 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common # REVISIT: This second line here bothers me more than just a little bit diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c index 0f2bee57e..feacc0edf 100644 --- a/src/input/input_pvr.c +++ b/src/input/input_pvr.c @@ -1208,6 +1208,12 @@ static buf_element_t *pvr_plugin_read_block (input_plugin_t *this_gen, fifo_buff return NULL; } + buf = fifo->buffer_pool_alloc (fifo); + if (todo < 0 || todo > buf->size) { + buf->free_buffer(buf); + return NULL; + } + if( this->scr_tunning == -2 ) speed = this->speed_before_pause; @@ -1231,7 +1237,6 @@ static buf_element_t *pvr_plugin_read_block (input_plugin_t *this_gen, fifo_buff pvr_event_handler(this); - buf = fifo->buffer_pool_alloc (fifo); buf->content = buf->mem; pthread_mutex_lock(&this->lock); diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am index 2b47415fd..ca2c624a2 100644 --- a/src/input/vcd/Makefile.am +++ b/src/input/vcd/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) |