diff options
author | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-03-24 14:15:36 +0000 |
---|---|---|
committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-03-24 14:15:36 +0000 |
commit | 0b1e872fa96412fdf7dc54b8f18ab34ac148e65d (patch) | |
tree | a0da29367fe2d667485a63d38c7e6e5380916a99 /src/demuxers/demux_mpeg_block.c | |
parent | 6d9934d47e664e902402f49c4cf962de5627bc87 (diff) | |
download | xine-lib-0b1e872fa96412fdf7dc54b8f18ab34ac148e65d.tar.gz xine-lib-0b1e872fa96412fdf7dc54b8f18ab34ac148e65d.tar.bz2 |
scr unregister patch from Michael Roitzsch, buffer mem release fix, xmalloc_aligned cleanup - fb vo plugin needs to be fixed for this one
CVS patchset: 1626
CVS date: 2002/03/24 14:15:36
Diffstat (limited to 'src/demuxers/demux_mpeg_block.c')
-rw-r--r-- | src/demuxers/demux_mpeg_block.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 01722a15c..5c1378f1f 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.81 2002/03/21 21:48:49 guenter Exp $ + * $Id: demux_mpeg_block.c,v 1.82 2002/03/24 14:15:36 guenter Exp $ * * demultiplexer for mpeg 1/2 program streams * @@ -72,7 +72,7 @@ typedef struct demux_mpeg_block_s { char cur_mrl[256]; - uint8_t *scratch; + uint8_t *scratch, *scratch_base; int64_t last_scr; int64_t nav_last_end_pts; @@ -1133,7 +1133,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { this->demux_plugin.get_stream_length = demux_mpeg_block_get_stream_length; this->demux_plugin.get_mimetypes = demux_mpeg_block_get_mimetypes; - this->scratch = xine_xmalloc_aligned (512, 4096); + this->scratch = xine_xmalloc_aligned (512, 4096, &this->scratch_base); return (demux_plugin_t *) this; } |