diff options
| -rw-r--r-- | src/demuxers/demux_mpeg_block.c | 18 | ||||
| -rw-r--r-- | src/input/input_dvd.c | 7 | ||||
| -rw-r--r-- | src/input/input_plugin.h | 11 |
3 files changed, 7 insertions, 29 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index e8eabe480..79b65c7f3 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_mpeg_block.c,v 1.124 2002/10/23 10:08:48 jkeil Exp $ + * $Id: demux_mpeg_block.c,v 1.125 2002/10/25 15:36:16 mroi Exp $ * * demultiplexer for mpeg 1/2 program streams * @@ -1014,22 +1014,6 @@ static int demux_mpeg_block_start (demux_plugin_t *this_gen, } /* - * query CLUT from the input plugin - */ - - buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); - - if ((this->input->get_capabilities(this->input) & INPUT_CAP_CLUT) && - ((this->input->get_optional_data(this->input, buf->mem, INPUT_OPTIONAL_DATA_CLUT) - == INPUT_OPTIONAL_SUCCESS))) { - buf->type = BUF_SPU_CLUT; - - this->video_fifo->put(this->video_fifo, buf); - } else { - buf->free_buffer(buf); - } - - /* * now start demuxing */ this->send_newpts = 1; diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index a3ba50db4..18b437be5 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_dvd.c,v 1.102 2002/10/24 15:06:55 jkeil Exp $ + * $Id: input_dvd.c,v 1.103 2002/10/25 15:36:19 mroi Exp $ * */ @@ -203,7 +203,7 @@ static void device_change_cb(void *data, xine_cfg_entry_t *cfg) { static uint32_t dvd_plugin_get_capabilities (input_plugin_t *this_gen) { trace_print("Called\n"); - return INPUT_CAP_BLOCK | INPUT_CAP_CLUT | + return INPUT_CAP_BLOCK | #if CAN_SEEK INPUT_CAP_SEEKABLE | INPUT_CAP_VARIABLE_BITRATE | #endif @@ -1662,6 +1662,9 @@ static void *init_class (xine_t *xine, void *data) { /* * $Log: input_dvd.c,v $ + * Revision 1.103 2002/10/25 15:36:19 mroi + * remove obviously obsolete INPUT_CAP_CLUT and INPUT_OPTIONAL_DATA_CLUT + * * Revision 1.102 2002/10/24 15:06:55 jkeil * C99 version of macro definition with variable number of arguments added * diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h index 4a3f8ddc2..d647708a9 100644 --- a/src/input/input_plugin.h +++ b/src/input/input_plugin.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_plugin.h,v 1.35 2002/10/21 12:57:51 mroi Exp $ + * $Id: input_plugin.h,v 1.36 2002/10/25 15:36:22 mroi Exp $ */ #ifndef HAVE_INPUT_PLUGIN_H @@ -178,14 +178,6 @@ struct input_plugin_s { #define INPUT_CAP_BLOCK 0x00000002 -/* - * INPUT_CAP_CLUT: - * input plugin can provide an spu color lookup table - * (dvd-specific?) - */ - -#define INPUT_CAP_CLUT 0x00000004 - /* * INPUT_CAP_AUDIOLANG: * INPUT_CAP_SPULANG: @@ -231,7 +223,6 @@ struct input_plugin_s { #define INPUT_OPTIONAL_UNSUPPORTED 0 #define INPUT_OPTIONAL_SUCCESS 1 -#define INPUT_OPTIONAL_DATA_CLUT 1 #define INPUT_OPTIONAL_DATA_AUDIOLANG 2 #define INPUT_OPTIONAL_DATA_SPULANG 3 #define INPUT_OPTIONAL_DATA_TEXTSPU0 4 |