[MPlayer-cvslog] r31286 - in trunk: cfg-common-opts.h cfg-common.h libmpcodecs/ad.c libmpcodecs/ad_ffmpeg.c libmpcodecs/ad_liba52.c

[Diego Biurrun]

On Sun, May 30, 2010 at 11:06:15PM +0200, Reimar Döffinger wrote:
> On Sun, May 30, 2010 at 10:29:10PM +0200, Diego Biurrun wrote:
> > On Sun, May 30, 2010 at 06:46:31PM +0200, reimar wrote:
> > > 
> > > Log:
> > > Use the -a52drc option also for the libavcodec decoder.
> > > 
> > > --- trunk/cfg-common-opts.h	Sun May 30 16:29:18 2010	(r31285)
> > > +++ trunk/cfg-common-opts.h	Sun May 30 18:46:31 2010	(r31286)
> > > @@ -19,9 +19,8 @@
> > >  #ifndef MPLAYER_CFG_COMMON_OPTS_H
> > >  #define MPLAYER_CFG_COMMON_OPTS_H
> > >  
> > > -#include "config.h"
> > > -#include "libmpcodecs/vd.h"
> > > -#include "osdep/priority.h"
> > > +// you may _not_ include any files here since this is included
> > > +// in the middle of an array declaration
> > 
> > I think the problem is that the file is confusingly named.
> > People expect .h files to be headers and not templates.
> > 
> > I will rename this to cfg-common-template.c, that should
> > solve the problem.
> 
> Well, it does not help that much IMO, even a template usually isn't included
> in the middle of a array declaration - I don't think the name makes that
> much of a difference, a explanation is simply necessary.

The explanation is already there, but IMO both cannot hurt...

Diego