From 42448dd3a4356476b86a5199c38014e043793a75 Mon Sep 17 00:00:00 2001
From: compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 20 Sep 2009 12:13:36 +0000
Subject: add coreavc entry, works on windows only. and only after buying the
 codec and installing it. the codec will then read the serial from your
 windows registry.

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

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 782ff61809..fe84ca0b66 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -899,6 +899,22 @@ videocodec ffh264vdpau
   dll h264_vdpau
   out VDPAU_H264
 
+videocodec coreavcwindows
+  info "CoreAVC H.264 for x86 - http://corecodec.org/"
+  comment "this codec will only work after purchasing it"
+  status working
+  fourcc H264,h264
+  fourcc X264,x264
+  fourcc avc1 AVC1,AVC1
+  fourcc davc,DAVC
+  fourcc VSSH
+  format 0x10000005
+  driver dshow
+  dll "CoreAVCDecoder.ax"
+  guid 0x09571a4b, 0xf1fe, 0x4c60, 0x97, 0x60, 0xde, 0x6d, 0x31, 0x0c, 0x7c, 0x31
+  out YV12,IYUV,I420,YUY2
+
+
 videocodec ffsvq3
   info "FFmpeg Sorenson Video v3 (SVQ3)"
   status working
-- 
cgit v1.2.3


From e0f6b6051de60100c233fd5688153be4c223cd3d Mon Sep 17 00:00:00 2001
From: compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 20 Sep 2009 12:31:36 +0000
Subject: add newer microsoft screen binary codec patch by william0wang
 (mplayer-ww).

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

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index fe84ca0b66..91486d10d4 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1164,6 +1164,16 @@ videocodec wmsdmod
   guid 0x7bafb3b1, 0xd8f4, 0x4279, 0x92, 0x53, 0x27, 0xda, 0x42, 0x31, 0x08, 0xde
   out BGR32,BGR24,BGR16
 
+videocodec wms10dmod
+  info "Windows Media Screen Codec 2 from WMP10"
+  status working
+  fourcc MSS1
+  fourcc MSS2
+  driver dmo
+  dll "wms10dmod.dll"
+  guid 0x7bafb3b1, 0xd8f4, 0x4279, 0x92, 0x53, 0x27, 0xda, 0x42, 0x31, 0x08, 0xde
+  out BGR32,BGR24,BGR16
+
 videocodec gotomeeting
   info "GoToMeeting codec"
   status working
-- 
cgit v1.2.3


From 541888558ad1b0968e1a4be3c7ed40af4f507ea4 Mon Sep 17 00:00:00 2001
From: compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 20 Sep 2009 12:41:21 +0000
Subject: add another aac tag patch by william0wang (mplayer-ww)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29697 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 91486d10d4..b0ca637c23 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3544,6 +3544,7 @@ audiocodec ffaac
   format 0x706D
   format 0x4143 ; aac in asf
   format 0xA106 ; aac in avi not yet working
+  format 0xAAC0 ; Borgtech nonsense tag
   driver ffmpeg
   dll aac
 
-- 
cgit v1.2.3


From a40c6e2018f5d761befd0f3674ad566f042f59e3 Mon Sep 17 00:00:00 2001
From: compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 20 Sep 2009 14:41:35 +0000
Subject: sync faad / ffaac supported fourccs as spotted by reimar

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29698 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 b0ca637c23..84660fc82f 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3525,10 +3525,12 @@ audiocodec faad
   fourcc "VLB " ; Used in NSV, not really working
   fourcc "AAC " ; Used in NSV
   fourcc "AACP" ; Used in NSV for AACPlus
+  fourcc raac,racp
   format 0xff
   format 0x706D
   format 0x4143 ; aac in asf
   format 0xA106 ; aac in avi
+  format 0xAAC0 ; Borgtech nonsense tag
   driver faad
   dll libfaad2
 
-- 
cgit v1.2.3