Commit 3bc946fc authored by Sam Hocevar's avatar Sam Hocevar

. fixed an other typo

 . fixed the aliases install
 . renamed an inconsistent variable in src/input/input_file.c
parent d37f5e1f
...@@ -4,7 +4,9 @@ O.1.99i : ...@@ -4,7 +4,9 @@ O.1.99i :
bugs in the video parser and video decoder. bugs in the video parser and video decoder.
* put names of authors under a lot of source files, for historical * put names of authors under a lot of source files, for historical
purposes. purposes.
* fixed an other input_file exit bug for the beos version. * fixed another input_file exit bug for the beos version.
* fixed the aliases install.
* renamed an inconsistent varaible in src/input/input_file.c.
Tue, 22 Aug 2000 01:31:58 +0200 Tue, 22 Aug 2000 01:31:58 +0200
0.1.99h : 0.1.99h :
......
...@@ -375,7 +375,8 @@ distclean: clean ...@@ -375,7 +375,8 @@ distclean: clean
install: install:
mkdir -p $(prefix)/bin mkdir -p $(prefix)/bin
$(INSTALL) vlc $(prefix)/bin $(INSTALL) vlc $(prefix)/bin
for alias in @ALIASES@ ; do ln -s vlc $(prefix)/bin/$$alias ; done # ugly
for alias in "" @ALIASES@ ; do if test $$alias ; then ln -s vlc $(prefix)/bin/$$alias ; fi ; done
mkdir -p $(prefix)/lib/videolan/vlc mkdir -p $(prefix)/lib/videolan/vlc
$(INSTALL) -m 644 $(PLUGINS) $(prefix)/lib/videolan/vlc $(INSTALL) -m 644 $(PLUGINS) $(prefix)/lib/videolan/vlc
mkdir -p $(prefix)/share/videolan mkdir -p $(prefix)/share/videolan
......
This diff is collapsed.
...@@ -11,8 +11,12 @@ AC_SUBST(VLC_CODENAME) ...@@ -11,8 +11,12 @@ AC_SUBST(VLC_CODENAME)
dnl Check for tools dnl Check for tools
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_PROG_CC if test -z "$CC"; then
AC_PROG_CPP AC_PROG_CC
fi
if test -z "$CPP"; then
AC_PROG_CPP
fi
dnl AM_PROG_LIBTOOL dnl AM_PROG_LIBTOOL
AC_PROG_INSTALL AC_PROG_INSTALL
......
...@@ -891,12 +891,12 @@ void ps_fill( input_file_t * p_if, boolean_t wait ) ...@@ -891,12 +891,12 @@ void ps_fill( input_file_t * p_if, boolean_t wait )
{ {
in_data_t * p_in_data = &p_if->in_data; in_data_t * p_in_data = &p_if->in_data;
ps_t * p_ps = &p_if->ps; ps_t * p_ps = &p_if->ps;
int i, how_many; int i, howmany;
int pcr_flag; int pcr_flag;
file_ts_packet *ts; file_ts_packet *ts;
/* How many TS packet for the next UDP packet */ /* How many TS packet for the next UDP packet */
how_many = TS_IN_UDP; howmany = TS_IN_UDP;
pcr_flag = 0; pcr_flag = 0;
/* for every single TS packet */ /* for every single TS packet */
...@@ -926,15 +926,15 @@ void ps_fill( input_file_t * p_if, boolean_t wait ) ...@@ -926,15 +926,15 @@ void ps_fill( input_file_t * p_if, boolean_t wait )
vlc_mutex_unlock(&p_in_data->lock); vlc_mutex_unlock(&p_in_data->lock);
/* read a whole UDP packet from the file */ /* read a whole UDP packet from the file */
p_ps->ts_to_write = how_many; p_ps->ts_to_write = howmany;
if( ps_read( &p_if->options, p_ps, ts = (file_ts_packet *)(p_in_data->buf + p_in_data->end) ) != how_many ) if( ps_read( &p_if->options, p_ps, ts = (file_ts_packet *)(p_in_data->buf + p_in_data->end) ) != howmany )
{ {
msleep( 50000 ); /* XXX we need an INPUT_IDLE */ msleep( 50000 ); /* XXX we need an INPUT_IDLE */
return; return;
} }
/* Scan to mark TS packets containing a PCR */ /* Scan to mark TS packets containing a PCR */
for( i = 0 ; i < how_many ; i++ , ts++ ) for( i = 0 ; i < howmany ; i++ , ts++ )
{ {
pcr_flag |= keep_pcr( p_ps->pcr_pid, ts ); pcr_flag |= keep_pcr( p_ps->pcr_pid, ts );
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment