summaryrefslogtreecommitdiff
path: root/src/demuxers/demux_mpeg_block.c
diff options
context:
space:
mode:
authorGuenter Bartsch <guenter@users.sourceforge.net>2001-12-01 22:38:31 +0000
committerGuenter Bartsch <guenter@users.sourceforge.net>2001-12-01 22:38:31 +0000
commitf7b2fd87c8fd9e0e52f6e31ecbf0bb7c5f1f8297 (patch)
tree3c3f00fb39dd790a18842b9ffb9bdac5dbda09cb /src/demuxers/demux_mpeg_block.c
parent742043db716a6c83656607642a0789380663cb7f (diff)
downloadxine-lib-f7b2fd87c8fd9e0e52f6e31ecbf0bb7c5f1f8297.tar.gz
xine-lib-f7b2fd87c8fd9e0e52f6e31ecbf0bb7c5f1f8297.tar.bz2
add avi subtitle decoder (based on mplayer code), minor cleanups, removed register_empty function from configfile (undocumented and doesn't make sense)
CVS patchset: 1153 CVS date: 2001/12/01 22:38:31
Diffstat (limited to 'src/demuxers/demux_mpeg_block.c')
-rw-r--r--src/demuxers/demux_mpeg_block.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index 154c33464..81b17d775 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.66 2001/11/30 21:55:05 f1rmb Exp $
+ * $Id: demux_mpeg_block.c,v 1.67 2001/12/01 22:38:31 guenter Exp $
*
* demultiplexer for mpeg 1/2 program streams
*
@@ -104,7 +104,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m
printf ("demux_mpeg_block: checking if we can branch to %s\n", next_mrl);
- if (this->input->is_branch_possible
+ if (next_mrl && this->input->is_branch_possible
&& this->input->is_branch_possible (this->input, next_mrl)) {
printf ("demux_mpeg_block: branching\n");