xbmc: update to xbmc-13-0796f0e

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-06-15 04:10:48 +02:00
parent 39c7ba1576
commit dd2c71f020
3 changed files with 2 additions and 30 deletions

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="13-84725b0"
PKG_VERSION="13-0796f0e"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="13-84725b0"
PKG_VERSION="13-0796f0e"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -23637,31 +23637,3 @@ index c95f4ec..d1e6c1f 100644
#endif
--
1.9.3
From e41281c608aa075fa87e1abf67837ad8d27bab63 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Tue, 13 May 2014 08:21:37 +0200
Subject: [PATCH 122/122] dvdplayer: demuxFFmpeg - use bits_per_coded_sample if
bits_per_raw_sample is zero
---
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
index 61272ee..286ac4f 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -1226,6 +1226,8 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int iId)
st->iBlockAlign = pStream->codec->block_align;
st->iBitRate = pStream->codec->bit_rate;
st->iBitsPerSample = pStream->codec->bits_per_raw_sample;
+ if (st->iBitsPerSample == 0)
+ st->iBitsPerSample = pStream->codec->bits_per_coded_sample;
if(av_dict_get(pStream->metadata, "title", NULL, 0))
st->m_description = av_dict_get(pStream->metadata, "title", NULL, 0)->value;
--
1.9.3