[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash libmedia/ffmpeg/MediaParserFfmpeg.cpp lib...
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash libmedia/ffmpeg/MediaParserFfmpeg.cpp lib... |
Date: |
Fri, 06 Jun 2008 19:53:31 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/06/06 19:53:31
Modified files:
libmedia/ffmpeg: MediaParserFfmpeg.cpp MediaParserFfmpeg.h
. : ChangeLog
Log message:
* libmedia/ffmpeg/MediaParserFfmpeg.{cpp,h}: fix build with more
recent ffmpeg (bug #23502).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/MediaParserFfmpeg.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/MediaParserFfmpeg.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6839&r2=1.6840
Patches:
Index: libmedia/ffmpeg/MediaParserFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/MediaParserFfmpeg.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libmedia/ffmpeg/MediaParserFfmpeg.cpp 6 Jun 2008 16:45:09 -0000
1.7
+++ libmedia/ffmpeg/MediaParserFfmpeg.cpp 6 Jun 2008 19:53:30 -0000
1.8
@@ -350,8 +350,11 @@
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
boost::uint64_t duration = _videoStream->codec_info_duration;
-
+#else
+ boost::uint64_t duration = _videoStream->duration;
+#endif
_videoInfo.reset( new VideoInfo(codec, width, height,
frameRate, duration, FFMPEG /*codec type*/) );
}
@@ -362,8 +365,11 @@
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
boost::uint64_t duration = _videoStream->codec_info_duration;
-
+#else
+ boost::uint64_t duration = _videoStream->duration;
+#endif
_audioInfo.reset( new AudioInfo(codec, sampleRate, sampleSize,
stereo, duration, FFMPEG /*codec type*/) );
}
Index: libmedia/ffmpeg/MediaParserFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/MediaParserFfmpeg.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libmedia/ffmpeg/MediaParserFfmpeg.h 6 Jun 2008 16:45:09 -0000 1.7
+++ libmedia/ffmpeg/MediaParserFfmpeg.h 6 Jun 2008 19:53:30 -0000 1.8
@@ -36,6 +36,12 @@
}
#endif
+#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
+extern "C" {
+#include <libavformat/avformat.h>
+}
+#endif
+
// Forward declaration
class tu_file;
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6839
retrieving revision 1.6840
diff -u -b -r1.6839 -r1.6840
--- ChangeLog 6 Jun 2008 19:30:40 -0000 1.6839
+++ ChangeLog 6 Jun 2008 19:53:30 -0000 1.6840
@@ -1,3 +1,8 @@
+2008-06-06 Sandro Santilli <address@hidden>
+
+ * libmedia/ffmpeg/MediaParserFfmpeg.{cpp,h}: fix build with more
+ recent ffmpeg (bug #23502).
+
2008-06-06 Russ Nelson <address@hidden>
* macros/ffmpeg.m4: Previous method for location of ffmpeg
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash libmedia/ffmpeg/MediaParserFfmpeg.cpp lib...,
Sandro Santilli <=