current/SOURCES/0115-Replace-deprecated-is_streamed-with-new-seekable-fla.patch

From 46a3599c0fad0aab7d06bc74db090642a534d19c Mon Sep 17 00:00:00 2001
From: elupus <elupus@xbmc.org>
Date: Mon, 12 Dec 2011 22:18:18 +0100
Subject: [PATCH 115/145] Replace deprecated is_streamed with new seekable
 flags (cherry picked from commit
 8d4876732c80fe27e48c4b17d143655fb0737d9a)

---
 .../dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp   |    2 +-
 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp                |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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
-- 
1.7.10

1	From 46a3599c0fad0aab7d06bc74db090642a534d19c Mon Sep 17 00:00:00 2001
2	From: elupus <elupus@xbmc.org>
3	Date: Mon, 12 Dec 2011 22:18:18 +0100
4	Subject: [PATCH 115/145] Replace deprecated is_streamed with new seekable
5	flags (cherry picked from commit
6	8d4876732c80fe27e48c4b17d143655fb0737d9a)
7
8	---
9	.../dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp \| 2 +-
10	xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp \| 4 ++--
11	2 files changed, 3 insertions(+), 3 deletions(-)
12
13	diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp
14	index 8fae8bf..9b71fd3 100644
15	--- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp
16	+++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp
17	@@ -108,7 +108,7 @@ bool CDVDAudioCodecPassthroughFFmpeg::SetupMuxer(CDVDStreamInfo &hints, CStdStri
18	}
19
20	/* this is streamed, no file, and ignore the index */
21	- muxer.m_pFormat->pb->is_streamed = 1;
22	+ muxer.m_pFormat->pb->seekable = 0;
23	muxer.m_pFormat->flags \|= AVFMT_NOFILE \| AVFMT_FLAG_IGNIDX;
24	muxer.m_pFormat->bit_rate = hints.bitrate;
25
26	diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
27	index f1b0119..cdc6e8f 100644
28	--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
29	+++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
30	@@ -307,7 +307,7 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput)
31	m_ioContext->max_packet_size *= FFMPEG_FILE_BUFFER_SIZE / m_ioContext->max_packet_size;
32
33	if(m_pInput->Seek(0, SEEK_POSSIBLE) == 0)
34	- m_ioContext->is_streamed = 1;
35	+ m_ioContext->seekable = 0;
36
37	if( iformat == NULL )
38	{
39	@@ -425,7 +425,7 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput)
40	}
41
42	// analyse very short to speed up mjpeg playback start
43	- if (iformat && (strcmp(iformat->name, "mjpeg") == 0) && m_ioContext->is_streamed)
44	+ if (iformat && (strcmp(iformat->name, "mjpeg") == 0) && m_ioContext->seekable == 0)
45	m_pFormatContext->max_analyze_duration = 500000;
46
47	// we need to know if this is matroska or avi later
48	--
49	1.7.10
50