xbmc: update to xbmc-13.alpha-f8b0614, update FM patches

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-11-18 23:02:48 +01:00
parent 56ece16815
commit 3518a9affb
4 changed files with 1074 additions and 439 deletions

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="13.alpha-aa4ca63"
PKG_VERSION="13.alpha-f8b0614"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="13.alpha-aa4ca63"
PKG_VERSION="13.alpha-f8b0614"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -0,0 +1,31 @@
From d0950a72afe9eb62048084b3444dafa480ffd76b Mon Sep 17 00:00:00 2001
From: Marcel Groothuis <margro.xbmc@gmail.com>
Date: Sun, 17 Nov 2013 17:40:40 +0100
Subject: [PATCH] Fixed: compilation against external ffmpeg
---
lib/DllAvCodec.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h
index 3500670..cfffe2d 100644
--- a/lib/DllAvCodec.h
+++ b/lib/DllAvCodec.h
@@ -109,12 +109,12 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface
::avcodec_register_all();
}
virtual void avcodec_flush_buffers(AVCodecContext *avctx) { ::avcodec_flush_buffers(avctx); }
- virtual int avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options)
+ virtual int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options)
{
CSingleLock lock(DllAvCodec::m_critSection);
return ::avcodec_open2(avctx, codec, options);
}
- virtual int avcodec_open2_dont_call(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options) { *(volatile int *)0x0 = 0; return 0; }
+ virtual int avcodec_open2_dont_call(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options) { *(volatile int *)0x0 = 0; return 0; }
virtual int avcodec_close_dont_call(AVCodecContext *avctx) { *(volatile int *)0x0 = 0; return 0; }
virtual AVCodec *avcodec_find_decoder(enum AVCodecID id) { return ::avcodec_find_decoder(id); }
virtual AVCodec *avcodec_find_encoder(enum AVCodecID id) { return ::avcodec_find_encoder(id); }
--
1.8.4