Re: [Gnash-commit] /srv/bzr/gnash/trunk r9624: Fix build with older versions of ffmpeg (which will abort if they encounter

[strk]

On Mon, Aug 25, 2008 at 11:02:47AM +0200, strk wrote:
> On Mon, Aug 25, 2008 at 10:57:03AM +0200, strk wrote:
> > On Mon, Aug 25, 2008 at 10:55:30AM +0200, strk wrote:
> > > On Sun, Aug 24, 2008 at 07:15:59PM +0200, Benjamin Wolsey wrote:
> > > > 
> > > > > 
> > > > > gnash-head/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp:257: error: 
> > > > > 'CODEC_ID_VP6A' was not declared in this scope
> > > > > 
> > > > > Dunno since when it stopped working, but I'm sure it was working
> > > > > about one week ago..
> > > > 
> > > > I added it within the last week. I added a version check for
> > > > CODEC_ID_VP6A based on the version installed on my machine, which
> > > > obviously has it. So it seems you have the same or a later version of
> > > > ffmpeg which nevertheless doesn't have VP6A support.
> > > 
> > > You check for VIDEO_CODEC_VP6A being defined, which is defined
> > > by ourselves in libmedia/MediaParser.h
> > 
> > Ooops. Sorry, you indeed check for FFMPEG_VP6A. Still looking
> > where it is defined...
> 
> Alright. Found. We set it at ./configure time in gnashconfig.h, based
> on ffmpeg detected version.
> Now, my configure detects:
> 
>       checking ffmpeg version... 151380
> 
> Odd enough, the versions used to enable/disable features are
> shorter (looks like the leading '1' in my version is not known)
> 
>     if test ! -z "$ffmpeg_num_version" -a "$ffmpeg_num_version" -gt 51280; 
> then
>       AC_DEFINE(FFMPEG_AUDIO2, 1, [Define if avcodec_decode_audio2 can be 
> used.])
>     fi
> 
>     if test -z "$ffmpeg_num_version" -o "$ffmpeg_num_version" -lt 51270; then
>       AC_MSG_WARN([This version of ffmpeg/libavcodec is not able to play VP6 
> encoded video!])
>     else
>       AC_DEFINE(FFMPEG_VP6, 1, [Define if ffmpeg can play VP6.])
>     fi
> 
>     if test -z "$ffmpeg_num_version" -o "$ffmpeg_num_version" -lt 51490; then
>       AC_MSG_WARN([This version of ffmpeg/libavcodec is not able to play VP6A 
> encoded video!])
>     else
>       AC_DEFINE(FFMPEG_VP6A, 1, [Define if ffmpeg can play VP6A.])
>     fi
> 
> 151380 is bigger then all those. Removing the leading 1 would sound fine.
> Any idea ?

Here's the version info source:

  #define LIBAVCODEC_VERSION      1d.51.38.0

Should we strip the 1d ?

--strk;