diff options
| author | CrystalPT <CrystalPT@svn> | 2011-01-02 08:37:42 +0000 |
|---|---|---|
| committer | CrystalPT <CrystalPT@svn> | 2011-01-02 08:37:42 +0000 |
| commit | d010715b66cfdd10cc734ef7c7cad306df3054c5 (patch) | |
| tree | d30ae1bc4296cf09fdc8077ed98fca2ec4adb994 | |
| parent | 11182d71b8fb4a761374bf7ea49aef1682d3f3a5 (diff) | |
fixed: bitstream mode improperly set. Ticket #10981.
Broke AC3 passthrough for emotiva and NAD receivers.
Patch sent to ffmpeg by Anssi and accepted.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@35739 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
| -rw-r--r-- | system/players/dvdplayer/avcodec-52.dll | bin | 4875983 -> 4876109 bytes | |||
| -rw-r--r-- | system/players/dvdplayer/avformat-52.dll | bin | 733031 -> 733031 bytes | |||
| -rw-r--r-- | system/players/dvdplayer/avutil-50.dll | bin | 157274 -> 157981 bytes | |||
| -rw-r--r-- | system/players/dvdplayer/postproc-51.dll | bin | 163902 -> 163902 bytes | |||
| -rw-r--r-- | system/players/dvdplayer/swscale-0.6.1.dll | bin | 392185 -> 392185 bytes | |||
| -rw-r--r-- | xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c | 2 | ||||
| -rw-r--r-- | xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0038-fixed-bitstream-mode-improperly-set.-Ticket-10981.patch | 27 |
7 files changed, 28 insertions, 1 deletions
diff --git a/system/players/dvdplayer/avcodec-52.dll b/system/players/dvdplayer/avcodec-52.dll Binary files differindex dfd87068c2..f1cd02cf21 100644 --- a/system/players/dvdplayer/avcodec-52.dll +++ b/system/players/dvdplayer/avcodec-52.dll diff --git a/system/players/dvdplayer/avformat-52.dll b/system/players/dvdplayer/avformat-52.dll Binary files differindex 10aea964e2..47701a5a78 100644 --- a/system/players/dvdplayer/avformat-52.dll +++ b/system/players/dvdplayer/avformat-52.dll diff --git a/system/players/dvdplayer/avutil-50.dll b/system/players/dvdplayer/avutil-50.dll Binary files differindex 6e63ca379e..f648ba19ea 100644 --- a/system/players/dvdplayer/avutil-50.dll +++ b/system/players/dvdplayer/avutil-50.dll diff --git a/system/players/dvdplayer/postproc-51.dll b/system/players/dvdplayer/postproc-51.dll Binary files differindex f53ad4095e..24b6d9f4e9 100644 --- a/system/players/dvdplayer/postproc-51.dll +++ b/system/players/dvdplayer/postproc-51.dll diff --git a/system/players/dvdplayer/swscale-0.6.1.dll b/system/players/dvdplayer/swscale-0.6.1.dll Binary files differindex 761ea4f1f4..20aa040ac5 100644 --- a/system/players/dvdplayer/swscale-0.6.1.dll +++ b/system/players/dvdplayer/swscale-0.6.1.dll diff --git a/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c b/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c index 98184d6fd7..0dd543ec6c 100644 --- a/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c +++ b/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c @@ -108,7 +108,7 @@ static void bswap_buf16(uint16_t *dst, const uint16_t *src, int w) static int spdif_header_ac3(AVFormatContext *s, AVPacket *pkt) { IEC958Context *ctx = s->priv_data; - int bitstream_mode = pkt->data[6] & 0x7; + int bitstream_mode = pkt->data[5] & 0x7; ctx->data_type = IEC958_AC3 | (bitstream_mode << 8); ctx->pkt_offset = AC3_FRAME_SIZE << 2; diff --git a/xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0038-fixed-bitstream-mode-improperly-set.-Ticket-10981.patch b/xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0038-fixed-bitstream-mode-improperly-set.-Ticket-10981.patch new file mode 100644 index 0000000000..dce30ad8e6 --- /dev/null +++ b/xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0038-fixed-bitstream-mode-improperly-set.-Ticket-10981.patch @@ -0,0 +1,27 @@ +From 0174d1a8356374ac45bb1c8c148d1315d685e7c4 Mon Sep 17 00:00:00 2001 +From: CrystalPT <CrystalP@xbmc.org> +Date: Sun, 2 Jan 2011 03:06:57 -0500 +Subject: [PATCH] fixed: bitstream mode improperly set. Ticket #10981. + +Broke AC3 passthrough for emotiva and NAD receivers. +Patch sent to ffmpeg by Anssi and accepted. +--- + libavformat/spdif.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libavformat/spdif.c b/libavformat/spdif.c +index 98184d6..0dd543e 100644 +--- a/libavformat/spdif.c ++++ b/libavformat/spdif.c +@@ -108,7 +108,7 @@ static void bswap_buf16(uint16_t *dst, const uint16_t *src, int w) + static int spdif_header_ac3(AVFormatContext *s, AVPacket *pkt) + { + IEC958Context *ctx = s->priv_data; +- int bitstream_mode = pkt->data[6] & 0x7; ++ int bitstream_mode = pkt->data[5] & 0x7; + + ctx->data_type = IEC958_AC3 | (bitstream_mode << 8); + ctx->pkt_offset = AC3_FRAME_SIZE << 2; +-- +1.7.2.3.msysgit.0 + |