[Gnash-commit] gnash libmedia/ffmpeg/MediaParserFfmpeg.cpp Cha...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/06/19 17:34:38

Modified files:
        libmedia/ffmpeg: MediaParserFfmpeg.cpp 
        .              : ChangeLog 

Log message:
        * libmedia/ffmpeg/MediaParserFfmpeg.cpp (initializeParser): don't
          try to fetch audio info from video stream (eh..).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/MediaParserFfmpeg.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6980&r2=1.6981

Patches:
Index: libmedia/ffmpeg/MediaParserFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/MediaParserFfmpeg.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- libmedia/ffmpeg/MediaParserFfmpeg.cpp       16 Jun 2008 16:06:15 -0000      
1.17
+++ libmedia/ffmpeg/MediaParserFfmpeg.cpp       19 Jun 2008 17:34:37 -0000      
1.18
@@ -401,9 +401,9 @@
                boost::uint16_t sampleSize = 
SampleFormatToSampleSize(_audioStream->codec->sample_fmt);
                bool stereo = (_audioStream->codec->channels == 2);
 #if !defined(HAVE_LIBAVFORMAT_AVFORMAT_H) && !defined(HAVE_FFMPEG_AVCODEC_H)
-               boost::uint64_t duration = _videoStream->codec_info_duration;
+               boost::uint64_t duration = _audioStream->codec_info_duration;
 #else
-               boost::uint64_t duration = _videoStream->duration;
+               boost::uint64_t duration = _audioStream->duration;
 #endif
                _audioInfo.reset( new AudioInfo(codec, sampleRate, sampleSize, 
stereo, duration, FFMPEG /*codec type*/) );
                //log_debug("EXTRA: %d bytes of audio extra data", 
_videoStream->codec->extradata_size);

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6980
retrieving revision 1.6981
diff -u -b -r1.6980 -r1.6981
--- ChangeLog   19 Jun 2008 16:05:29 -0000      1.6980
+++ ChangeLog   19 Jun 2008 17:34:37 -0000      1.6981
@@ -1,5 +1,10 @@
 2008-06-19 Sandro Santilli <address@hidden>
 
+       * libmedia/ffmpeg/MediaParserFfmpeg.cpp (initializeParser): don't
+         try to fetch audio info from video stream (eh..).
+
+2008-06-19 Sandro Santilli <address@hidden>
+
        * server/asobj/Sound.{cpp,h}: any virtual class needs a virtual
          destructor !