From 792647b26a127d717e885447b62037b813e84b89 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 29 Aug 2013 18:07:52 +0200 Subject: [PATCH] - fix build with ffmpeg2 (sub_id removed upstream as useless) --- ffmpeg2.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/ffmpeg2.patch b/ffmpeg2.patch index c2b6604..65139f4 100644 --- a/ffmpeg2.patch +++ b/ffmpeg2.patch @@ -113,3 +113,25 @@ index bdad65b..8db5d7b 100644 #endif -- 1.8.1.6 +--- xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp~ 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp 2013-08-29 17:52:04.730897230 +0200 +@@ -60,7 +60,7 @@ + m_pCodecContext->debug_mv = 0; + m_pCodecContext->debug = 0; + m_pCodecContext->workaround_bugs = FF_BUG_AUTODETECT; +- m_pCodecContext->sub_id = hints.identifier; ++// m_pCodecContext->sub_id = hints.identifier; + m_pCodecContext->codec_tag = hints.codec_tag; + m_pCodecContext->time_base.num = 1; + m_pCodecContext->time_base.den = DVD_TIME_BASE; +--- xbmc-12.2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp~ 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2013-08-29 17:53:46.268749616 +0200 +@@ -1043,7 +1043,7 @@ + { + CDemuxStreamSubtitleFFmpeg* st = new CDemuxStreamSubtitleFFmpeg(this, pStream); + m_streams[iId] = st; +- st->identifier = pStream->codec->sub_id; ++// st->identifier = pStream->codec->sub_id; + + if(m_dllAvUtil.av_dict_get(pStream->metadata, "title", NULL, 0)) + st->m_description = m_dllAvUtil.av_dict_get(pStream->metadata, "title", NULL, 0)->value; -- 2.44.0