Re: [Gnash-commit] gnash ChangeLog libmedia/ffmpeg/MediaParserFfmp...

[Bastiaan Jacques]

Why did it need fixing? You can avoid me asking these questions every
time you make a cryptic commit by being more verbose in your commit
messages and/or ChangeLog...

Bastiaan

On Fri, 6 Jun 2008, Markus Gothe wrote:

> Log message:
>         Fixed #ifndef
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6847&r2=1.6848
> http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/MediaParserFfmpeg.cpp?cvsroot=gnash&r1=1.8&r2=1.9
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.6847
> retrieving revision 1.6848
> diff -u -b -r1.6847 -r1.6848
> --- ChangeLog   6 Jun 2008 23:04:09 -0000       1.6847
> +++ ChangeLog   6 Jun 2008 23:55:15 -0000       1.6848
> @@ -4,6 +4,7 @@
>           -Wunsafe-loop-optimizations since not all versions of
>           gcc supports it.
>         * utility.h: Fixed a quirk on Leopard/BSD for isfinite();
> +       * libmedia/ffmpeg/MediaParserFfmpeg.cpp: Fixed #ifndef.
>
> 2008-06-06 Russ Nelson <address@hidden>
>
>
> Index: libmedia/ffmpeg/MediaParserFfmpeg.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/libmedia/ffmpeg/MediaParserFfmpeg.cpp,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -b -r1.8 -r1.9
> --- libmedia/ffmpeg/MediaParserFfmpeg.cpp       6 Jun 2008 19:53:30 -0000       
> 1.8
> +++ libmedia/ffmpeg/MediaParserFfmpeg.cpp       6 Jun 2008 23:55:16 -0000       
> 1.9
> @@ -350,7 +350,7 @@
>                 boost::uint16_t width = _videoStream->codec->width;
>                 boost::uint16_t height = _videoStream->codec->height;
>                 boost::uint16_t frameRate = 
> static_cast<boost::uint16_t>(as_double(_videoStream->r_frame_rate));
> -#ifndef HAVE_LIBAVFORMAT_AVFORMAT_H
> +#if !defined(HAVE_LIBAVFORMAT_AVFORMAT_H) && !defined(HAVE_FFMPEG_AVCODEC_H)
>                 boost::uint64_t duration = _videoStream->codec_info_duration;
> #else
>                 boost::uint64_t duration = _videoStream->duration;
> @@ -365,7 +365,7 @@
>                 boost::uint16_t sampleRate = _audioStream->codec->sample_rate;
>                 boost::uint16_t sampleSize = 
> SampleFormatToSampleSize(_audioStream->codec->sample_fmt);
>                 bool stereo = (_audioStream->codec->channels == 2);
> -#ifndef HAVE_LIBAVFORMAT_AVFORMAT_H
> +#if !defined(HAVE_LIBAVFORMAT_AVFORMAT_H) && !defined(HAVE_FFMPEG_AVCODEC_H)
>                 boost::uint64_t duration = _videoStream->codec_info_duration;
> #else
>                 boost::uint64_t duration = _videoStream->duration;
>
>
> _______________________________________________
> Gnash-commit mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/gnash-commit