[Gnash-commit] /srv/bzr/gnash/trunk r9943: Allow build with all versions of ffmpeg up to current trunk.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 9943
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Mon 2008-10-06 20:04:17 +0200
message:
  Allow build with all versions of ffmpeg up to current trunk.
modified:
  libmedia/ffmpeg/MediaParserFfmpeg.cpp
  libmedia/ffmpeg/MediaParserFfmpeg.h
    ------------------------------------------------------------
    revno: 9941.1.1
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Mon 2008-10-06 19:33:39 +0200
    message:
      Use boost::int64_t instead of libavformat's offset_t, as they are the same
      and ffmpeg has now dropped offset_t.
    modified:
      libmedia/ffmpeg/MediaParserFfmpeg.cpp
      libmedia/ffmpeg/MediaParserFfmpeg.h

=== modified file 'libmedia/ffmpeg/MediaParserFfmpeg.cpp'
--- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp     2008-10-03 13:38:43 +0000
+++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp     2008-10-06 17:33:39 +0000
@@ -49,8 +49,8 @@
        return p->readPacket(buf, buf_size);
 }
 
-offset_t
-MediaParserFfmpeg::seekMediaWrapper(void *opaque, offset_t offset, int whence)
+boost::int64_t
+MediaParserFfmpeg::seekMediaWrapper(void *opaque, boost::int64_t offset, int 
whence)
 {
        MediaParserFfmpeg* p = static_cast<MediaParserFfmpeg*>(opaque);
        return p->seekMedia(offset, whence);
@@ -458,8 +458,8 @@
 
 }
 
-offset_t 
-MediaParserFfmpeg::seekMedia(offset_t offset, int whence)
+boost::int64_t 
+MediaParserFfmpeg::seekMedia(boost::int64_t offset, int whence)
 {
        GNASH_REPORT_FUNCTION;
 

=== modified file 'libmedia/ffmpeg/MediaParserFfmpeg.h'
--- a/libmedia/ffmpeg/MediaParserFfmpeg.h       2008-09-22 16:56:45 +0000
+++ b/libmedia/ffmpeg/MediaParserFfmpeg.h       2008-10-06 17:33:39 +0000
@@ -17,8 +17,8 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-#ifndef __MEDIAPARSER_FFMPEG_H__
-#define __MEDIAPARSER_FFMPEG_H__
+#ifndef GNASH_MEDIAPARSER_FFMPEG_H
+#define GNASH_MEDIAPARSER_FFMPEG_H
 
 #ifdef HAVE_CONFIG_H
 #include "gnashconfig.h"
@@ -125,10 +125,10 @@
        static int readPacketWrapper(void* opaque, boost::uint8_t* buf, int 
buf_size);
 
        /// Input stream seeker, to be called by ffmpeg parser
-       offset_t seekMedia(offset_t offset, int whence);
+       boost::int64_t seekMedia(boost::int64_t offset, int whence);
 
        /// ffmpeg callback function
-       static offset_t seekMediaWrapper(void *opaque, offset_t offset, int 
whence);
+       static boost::int64_t seekMediaWrapper(void *opaque, boost::int64_t 
offset, int whence);
 
        /// Read some of the input to figure an AVInputFormat
        AVInputFormat* probeStream();