diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/demuxers/demux_mpeg_block.c | 33 | ||||
| -rw-r--r-- | src/demuxers/demux_mpeg_pes.c | 33 | ||||
| -rw-r--r-- | src/demuxers/demux_ts.c | 15 |
3 files changed, 3 insertions, 78 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 0e9765ed8..b9428bf72 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.198 2003/11/15 14:00:49 miguelfreitas Exp $ + * $Id: demux_mpeg_block.c,v 1.199 2003/11/16 15:31:51 mroi Exp $ * * demultiplexer for mpeg 1/2 program streams * used with fixed blocksize devices (like dvd/vcd) @@ -87,9 +87,6 @@ typedef struct demux_mpeg_block_s { uint32_t stream_id; int32_t mpeg1; - /* stream index for get_audio/video_frame */ - int have_index; - int64_t last_cell_time; off_t last_cell_pos; int last_begin_time; @@ -1287,33 +1284,6 @@ static int demux_mpeg_block_get_stream_length (demux_plugin_t *this_gen) { return 0; } -static void generate_index (demux_mpeg_block_t *this) { - - /* FIXME: implement */ - -} - -static int demux_mpeg_block_get_video_frame (demux_plugin_t *this_gen, - int timestamp, - int *width, int *height, - int *ratio_code, - int *duration, - int *format, - uint8_t *img) { - - demux_mpeg_block_t *this = (demux_mpeg_block_t*) this_gen; - - if (!this->have_index) { - - generate_index (this); - - this->have_index = 1; - } - - - return 0; -} - static uint32_t demux_mpeg_block_get_capabilities(demux_plugin_t *this_gen) { return DEMUX_CAP_NOCAP; } @@ -1345,7 +1315,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->scratch = xine_xmalloc_aligned (512, 4096, (void**) &this->scratch_base); this->status = DEMUX_FINISHED; - this->have_index = 0; #ifdef LOG printf ("demux_mpeg_block:open_plugin:detection_method=%d\n", diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index ef28e7dcf..c2025213f 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.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_pes.c,v 1.15 2003/11/15 14:00:51 miguelfreitas Exp $ + * $Id: demux_mpeg_pes.c,v 1.16 2003/11/16 15:31:51 mroi Exp $ * * demultiplexer for mpeg 2 PES (Packetized Elementary Streams) * reads streams of variable blocksizes @@ -91,9 +91,6 @@ typedef struct demux_mpeg_pes_s { int32_t mpeg1; int32_t wait_for_program_stream_pack_header; - /* stream index for get_audio/video_frame */ - int have_index; - int64_t last_cell_time; off_t last_cell_pos; int last_begin_time; @@ -1335,33 +1332,6 @@ static int demux_mpeg_pes_get_stream_length (demux_plugin_t *this_gen) { return 0; } -static void generate_index (demux_mpeg_pes_t *this) { - - /* FIXME: implement */ - -} - -static int demux_mpeg_pes_get_video_frame (demux_plugin_t *this_gen, - int timestamp, - int *width, int *height, - int *ratio_code, - int *duration, - int *format, - uint8_t *img) { - - demux_mpeg_pes_t *this = (demux_mpeg_pes_t*) this_gen; - - if (!this->have_index) { - - generate_index (this); - - this->have_index = 1; - } - - - return 0; -} - static uint32_t demux_mpeg_pes_get_capabilities(demux_plugin_t *this_gen) { return DEMUX_CAP_NOCAP; } @@ -1393,7 +1363,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->scratch = xine_xmalloc_aligned (512, 4096, (void**) &this->scratch_base); this->status = DEMUX_FINISHED; - this->have_index = 0; /* Don't start demuxing stream until we see a program_stream_pack_header */ /* We need to system header in order to identify is the stream is mpeg1 or mpeg2. */ this->wait_for_program_stream_pack_header=1; diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 28f138801..3ca4dcf56 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.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_ts.c,v 1.94 2003/11/15 14:01:03 miguelfreitas Exp $ + * $Id: demux_ts.c,v 1.95 2003/11/16 15:31:51 mroi Exp $ * * Demultiplexer for MPEG2 Transport Streams. * @@ -1835,19 +1835,6 @@ static int demux_ts_get_stream_length (demux_plugin_t *this_gen) { return 0; } -static int demux_ts_get_video_frame (demux_plugin_t *this_gen, - int timestamp, - int *width, int *height, - int *ratio_code, - int *duration, - int *format, - uint8_t *img) { - - /* demux_ts_t *this = (demux_ts_t*)this_gen; */ - - return 0; -} - static uint32_t demux_ts_get_capabilities(demux_plugin_t *this_gen) { |