From f6cef36bdb13fc332184eba6afdaffb096c8e13a Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 12 Mar 2010 18:23:30 +0000
Subject: Add the 0xA109 format for speex, it is claimed to be officially
 registered (have not verified).

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

(limited to 'etc/codecs.conf')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 06fc94911b..2fe487bc91 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -4448,6 +4448,7 @@ audiocodec speex
   status working
   comment "Speex driver using libspeex"
   fourcc 'spx '
+  format 0xA109
   driver speex
   dll "speex"
 
-- 
cgit v1.2.3


From 13d16eb051b31e046c9943cf38c6e9f484b0af8e Mon Sep 17 00:00:00 2001
From: conrad <conrad@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 13 Mar 2010 22:46:58 +0000
Subject: fftheora supports 4:2:2 and 4:4:4 now

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

(limited to 'etc/codecs.conf')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 2fe487bc91..1233410e11 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2071,7 +2071,7 @@ videocodec fftheora
   format 0xFFFC
   driver ffmpeg
   dll "theora"
-  out YV12
+  out YV12,422P,444P
 
 videocodec vp3
   info "On2 Open Source VP3 Codec"
-- 
cgit v1.2.3


From 95f68d3976382c660f4225030a73870084a0a274 Mon Sep 17 00:00:00 2001
From: sesse <sesse@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 15 Mar 2010 12:58:17 +0000
Subject: Add support for Apple's ProRes and AIC codecs, now that all
 prerequisites are in place.

Add codecs.conf entry for both codecs, and qt_comp.h entry for ProRes
(not used except for debugging, so mainly for completeness). Both work
with -demuxer mov only, as all other QuickTime binary codecs.
AIC support is for OS X only, and untested.

Split out from a patch Andrew Wason (r e c t a l o g i c <at> rectalogic
<dot> com) posted in June.


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

(limited to 'etc/codecs.conf')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 1233410e11..1ae01939ad 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2754,6 +2754,25 @@ videocodec qtcine
   out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8
   out YV12,YUY2
 
+videocodec qtaic
+  info "QuickTime AIC video decoder"
+  comment "Mac OS X only"
+  status untested
+  fourcc icod
+  driver qtvideo
+  dll "QuickTime.qts"
+  out UYVY
+
+videocodec qtprores
+  info "Apple ProRes 422 (HQ) decoder"
+  status working
+  fourcc apch
+  fourcc apcn
+  fourcc apcs
+  driver qtvideo
+  dll "AppleProResDecoder.qtx"
+  out YUY2
+
 ; VSS codecs (http://vsofts.com/solutions.html):
 
 videocodec vsslight
-- 
cgit v1.2.3