31 lines
1002 B
Plaintext
31 lines
1002 B
Plaintext
|
$OpenBSD: patch-libmedia_ffmpeg_MediaParserFfmpeg_h,v 1.1 2013/03/08 00:58:26 brad Exp $
|
||
|
|
|
||
|
|
Update for newer FFmpeg API.
|
||
|
|
|
||
|
|
--- libmedia/ffmpeg/MediaParserFfmpeg.h.orig Thu Jan 19 14:17:48 2012
|
||
|
|
+++ libmedia/ffmpeg/MediaParserFfmpeg.h Mon Feb 18 12:06:22 2013
|
||
|
|
@@ -154,7 +154,13 @@ class MediaParserFfmpeg: public MediaParser (private)
|
||
|
|
AVStream* _audioStream;
|
||
|
|
|
||
|
|
/// ?
|
||
|
|
- ByteIOContext _byteIOCxt;
|
||
|
|
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52,107,0)
|
||
|
|
+// AVIOContext was introduced a bit earlier but without version bump, so let's
|
||
|
|
+// be safe
|
||
|
|
+ ByteIOContext _byteIOCxt;
|
||
|
|
+#else
|
||
|
|
+ AVIOContext* _avIOCxt;
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
/// Size of the ByteIO context buffer
|
||
|
|
//
|
||
|
|
@@ -172,7 +178,7 @@ class MediaParserFfmpeg: public MediaParser (private)
|
||
|
|
//
|
||
|
|
/// TODO: move somewhere in ffmpeg utils..
|
||
|
|
///
|
||
|
|
- boost::uint16_t SampleFormatToSampleSize(SampleFormat fmt);
|
||
|
|
+ boost::uint16_t SampleFormatToSampleSize(AVSampleFormat fmt);
|
||
|
|
|
||
|
|
/// Make an EncodedVideoFrame from an AVPacket and push to buffer
|
||
|
|
//
|