42 lines
1.9 KiB
Diff
42 lines
1.9 KiB
Diff
commit 8d4876732c80fe27e48c4b17d143655fb0737d9a
|
|
Author: elupus <elupus@xbmc.org>
|
|
Date: Mon Dec 12 22:18:18 2011 +0100
|
|
|
|
Replace deprecated is_streamed with new seekable flags
|
|
|
|
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp
|
|
index 8fae8bf..9b71fd3 100644
|
|
--- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp
|
|
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp
|
|
@@ -108,7 +108,7 @@ bool CDVDAudioCodecPassthroughFFmpeg::SetupMuxer(CDVDStreamInfo &hints, CStdStri
|
|
}
|
|
|
|
/* this is streamed, no file, and ignore the index */
|
|
- muxer.m_pFormat->pb->is_streamed = 1;
|
|
+ muxer.m_pFormat->pb->seekable = 0;
|
|
muxer.m_pFormat->flags |= AVFMT_NOFILE | AVFMT_FLAG_IGNIDX;
|
|
muxer.m_pFormat->bit_rate = hints.bitrate;
|
|
|
|
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
|
|
index f1b0119..cdc6e8f 100644
|
|
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
|
|
+++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
|
|
@@ -307,7 +307,7 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput)
|
|
m_ioContext->max_packet_size *= FFMPEG_FILE_BUFFER_SIZE / m_ioContext->max_packet_size;
|
|
|
|
if(m_pInput->Seek(0, SEEK_POSSIBLE) == 0)
|
|
- m_ioContext->is_streamed = 1;
|
|
+ m_ioContext->seekable = 0;
|
|
|
|
if( iformat == NULL )
|
|
{
|
|
@@ -425,7 +425,7 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput)
|
|
}
|
|
|
|
// analyse very short to speed up mjpeg playback start
|
|
- if (iformat && (strcmp(iformat->name, "mjpeg") == 0) && m_ioContext->is_streamed)
|
|
+ if (iformat && (strcmp(iformat->name, "mjpeg") == 0) && m_ioContext->seekable == 0)
|
|
m_pFormatContext->max_analyze_duration = 500000;
|
|
|
|
// we need to know if this is matroska or avi later
|