- fix build with ffmpeg2 (sub_id removed upstream as useless)

diff --git a/ffmpeg2.patch b/ffmpeg2.patch
index c2b66041ec69a994884551d8e9f4f89a213b0bf7..65139f433fe3f968789f6ac93e0c3c3c3bede69b 100644 (file)
--- a/ffmpeg2.patch
+++ b/ffmpeg2.patch
@@ -113,3 +113,25 @@ index bdad65b..8db5d7b 100644
  #endif\r
 -- \r
 1.8.1.6\r
+--- xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp~        2013-05-03 07:57:41.000000000 +0200\r
++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp 2013-08-29 17:52:04.730897230 +0200\r
+@@ -60,7 +60,7 @@\r
+   m_pCodecContext->debug_mv = 0;\r
+   m_pCodecContext->debug = 0;\r
+   m_pCodecContext->workaround_bugs = FF_BUG_AUTODETECT;\r
+-  m_pCodecContext->sub_id = hints.identifier;\r
++//  m_pCodecContext->sub_id = hints.identifier;\r
+   m_pCodecContext->codec_tag = hints.codec_tag;\r
+   m_pCodecContext->time_base.num = 1;\r
+   m_pCodecContext->time_base.den = DVD_TIME_BASE;\r
+--- xbmc-12.2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp~     2013-05-03 07:57:41.000000000 +0200\r
++++ xbmc-12.2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp      2013-08-29 17:53:46.268749616 +0200\r
+@@ -1043,7 +1043,7 @@\r
+         {\r
+           CDemuxStreamSubtitleFFmpeg* st = new CDemuxStreamSubtitleFFmpeg(this, pStream);\r
+           m_streams[iId] = st;\r
+-          st->identifier = pStream->codec->sub_id;\r
++//          st->identifier = pStream->codec->sub_id;\r
+           \r
+           if(m_dllAvUtil.av_dict_get(pStream->metadata, "title", NULL, 0))\r
+             st->m_description = m_dllAvUtil.av_dict_get(pStream->metadata, "title", NULL, 0)->value;\r