[SCM] xbmc/master: Refresh patches

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3e45bbe0c6dfca3a851ebdbd1829cfc9a1f5aa03
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Thu May 29 22:04:44 2014 +0700

    Refresh patches

diff --git a/debian/patches/0006-Define-AV_CODEC_ID_SUBRIP-to-AV_CODEC_ID_TEXT-in-lib.patch b/debian/patches/0006-Define-AV_CODEC_ID_SUBRIP-to-AV_CODEC_ID_TEXT-in-lib.patch
index 305fd08..7d452b9 100644
--- a/debian/patches/0006-Define-AV_CODEC_ID_SUBRIP-to-AV_CODEC_ID_TEXT-in-lib.patch
+++ b/debian/patches/0006-Define-AV_CODEC_ID_SUBRIP-to-AV_CODEC_ID_TEXT-in-lib.patch
@@ -9,8 +9,6 @@ Subject: [PATCH 2/3] Define AV_CODEC_ID_SUBRIP to AV_CODEC_ID_TEXT in libav
  xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp | 9 ++++++++-
  2 files changed, 9 insertions(+), 2 deletions(-)
 
-diff --git a/lib/xbmc-libav-hacks/libav_hacks.h b/lib/xbmc-libav-hacks/libav_hacks.h
-index a315c05..af64980 100644
 --- a/lib/xbmc-libav-hacks/libav_hacks.h
 +++ b/lib/xbmc-libav-hacks/libav_hacks.h
 @@ -45,7 +45,7 @@
@@ -22,11 +20,9 @@ index a315c05..af64980 100644
  
  AVDictionary *av_frame_get_metadata       (const AVFrame *frame);
  
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
-index a7445d3..dcb7534 100644
 --- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
 +++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
-@@ -391,10 +391,17 @@ CDVDOverlayCodec* CDVDFactoryCodec::CreateOverlayCodec( CDVDStreamInfo &hint )
+@@ -386,10 +386,17 @@
    CDVDOverlayCodec* pCodec = NULL;
    CDVDCodecOptions options;
  
@@ -45,6 +41,3 @@ index a7445d3..dcb7534 100644
        pCodec = OpenCodec(new CDVDOverlayCodecText(), hint, options);
        if( pCodec ) return pCodec;
        break;
--- 
-1.9.1
-

-- 
xbmc packaging