From 88a8408212dfb055ce6bd9ea160e7c4e259cb8d0 Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 26 Aug 2009 02:37:56 +0000
Subject: Fix AC3 in least one Bluray sample with demuxer lavf.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29550 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 530630beff..c8b2c7b01d 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3800,6 +3800,7 @@ audiocodec ffac3
   status working
   format 0x2000
   format 0x332D6361 ; ac-3 in mp4
+  format 0x332D4341
   fourcc dnet
   fourcc sac3
   driver ffmpeg
-- 
cgit v1.2.3


From f485823bc3716db43029bec6fdc49aea6a168bdc Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 26 Aug 2009 02:43:15 +0000
Subject: Fix DTS in least one Bluray sample with demuxer lavf.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29551 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index c8b2c7b01d..8143ac2bab 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3817,12 +3817,14 @@ audiocodec dts
   info "DTS-libdca"
   status working
   format 0x2001
+  format 0x86
   driver libdca
 
 audiocodec ffdca
   info "FFmpeg DTS"
   status working
   format 0x2001
+  format 0x86
   driver ffmpeg
   dll "dca"
 
-- 
cgit v1.2.3


From 97503eb4ee91d6678c70d85e9b01e07034d26382 Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 30 Aug 2009 21:14:42 +0000
Subject: Support PCM in Bluray streams.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29588 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 8143ac2bab..d083d62afc 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3786,6 +3786,13 @@ audiocodec dvdpcm
   format 0x10001
   driver dvdpcm
 
+audiocodec lpcm
+  info "Bluray LPCM"
+  status working
+  fourcc BPCM
+  driver ffmpeg
+  dll pcm_bluray
+
 audiocodec a52
   info "AC3-liba52"
   status working
-- 
cgit v1.2.3


From ae6e3b9fc2e53085864d4413ed63d2c09b7426a2 Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 30 Aug 2009 22:55:21 +0000
Subject: Revert r29404. Playing H264 in ts files should now always work
 without this workaround.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29592 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 2 --
 1 file changed, 2 deletions(-)

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index d083d62afc..335f3868e5 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -874,7 +874,6 @@ videocodec ffh264
   fourcc X264,x264
   fourcc avc1,AVC1
   fourcc davc,DAVC
-  fourcc HDMV
   format 0x10000005
   driver ffmpeg
   dll h264
@@ -887,7 +886,6 @@ videocodec ffh264vdpau
   fourcc X264,x264
   fourcc avc1,AVC1
   fourcc davc,DAVC
-  fourcc HDMV
   format 0x10000005
   driver ffmpeg
   dll h264_vdpau
-- 
cgit v1.2.3


From 7a6ab8a711fba305cb29f13baee12663d9045385 Mon Sep 17 00:00:00 2001
From: compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 30 Aug 2009 23:28:38 +0000
Subject: bpcm is internal mplayer fourcc

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29594 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 335f3868e5..4eda2df0f1 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3787,7 +3787,7 @@ audiocodec dvdpcm
 audiocodec lpcm
   info "Bluray LPCM"
   status working
-  fourcc BPCM
+  fourcc BPCM ; internal MPlayer FourCC
   driver ffmpeg
   dll pcm_bluray
 
-- 
cgit v1.2.3


From 758980965caeb6e4996654b56627a2a0e1ff652a Mon Sep 17 00:00:00 2001
From: faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 2 Sep 2009 17:49:24 +0000
Subject: enable ffwmapro

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29633 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 4eda2df0f1..fd9a484c09 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3652,6 +3652,14 @@ audiocodec ffwmav2
   driver ffmpeg
   dll "wmav2"
 
+audiocodec ffwmapro
+  info "WMA Pro audio (FFmpeg)"
+  status untested
+  format 0x162
+  fourcc "WMA3"
+  driver ffmpeg
+  dll "wmapro"
+
 audiocodec ffmac3
   info "Macintosh Audio Compression and Expansion 3:1"
   status untested
-- 
cgit v1.2.3