[MPlayer-cvslog] CVS: main mencoder.c,1.289,1.290

[Oded Shimon]

On Wed, Jun 29, 2005 at 01:02:01AM -0400, Rich Felker wrote:
> On Mon, Jun 27, 2005 at 09:10:14PM +0200, Nico Sabbi CVS wrote:
> > CVS change done by Nico Sabbi CVS
> > 
> > Update of /cvsroot/mplayer/main
> > In directory mail:/var2/tmp/cvs-serv13871
> > 
> > Modified Files:
> > 	mencoder.c 
> > Log Message:
> > -don't encode more audio than needed; -edl_skip is int, not short; -don't read audio_data to skip in mux_a->buffer; -edl_seek works on input streams, not output; -one-frame accuracy fix ; patch by Oded Shimon
> > 
> > Index: mencoder.c
> > ===================================================================
> > RCS file: /cvsroot/mplayer/main/mencoder.c,v
> > retrieving revision 1.289
> > retrieving revision 1.290
> > diff -u -r1.289 -r1.290
> > --- mencoder.c	24 Jun 2005 10:50:52 -0000	1.289
> > +++ mencoder.c	27 Jun 2005 19:10:11 -0000	1.290
> > @@ -239,7 +239,7 @@
> >  static short edl_muted; ///< Stores whether EDL is currently in muted mode.
> >  static short edl_seeking; ///< When non-zero, stream is seekable.
> >  static short edl_seek_type; ///< When non-zero, frames are discarded instead of seeking.
> > -static short edl_skip; ///< -1 OR the value of in_size of an already read frame.
> > +static int edl_skip; ///< -1 OR the value of in_size of an already read frame.
> 
> Why are there any shorts?!?! short should NEVER be used except in
> array/pointer type for addressing 16-bit buffers. 100l to whoever
> wrote that (oded?? ;)

Yes that was me, they are only flags. so, umm, change to int?..

- ods15