From 614b6f25db66595e150705256bc83120d2799c4b Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 26 Nov 2008 13:04:10 +0000
Subject: Update Tremor comment regarding fixed-point mode.

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

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 79184f2c22..a22b7aa056 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3494,7 +3494,7 @@ audiocodec vorbis
 audiocodec tremor
   info "OggVorbis audio decoder"
   status working
-  comment "OggVorbis fixed-point decoder useful for ARM based systems"
+  comment "fixed-point decoder useful systems without floating-point unit"
   fourcc vrbs
   format 0x566F
   driver tremor
-- 
cgit v1.2.3


From 513bd7461dbfe6aff0d1d4ee96299694f637dcb8 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 26 Nov 2008 16:27:39 +0000
Subject: Add support for RGB formats to vo_direct3d

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28040 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/vo_direct3d.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libvo/vo_direct3d.c b/libvo/vo_direct3d.c
index 78b8dbc159..610759492e 100644
--- a/libvo/vo_direct3d.c
+++ b/libvo/vo_direct3d.c
@@ -90,6 +90,12 @@ static const struct_fmt_table fmt_table[] = {
     {IMGFMT_YVU9, MAKEFOURCC('Y','V','U','9')},
     {IMGFMT_YUY2, MAKEFOURCC('Y','U','Y','2')},
     {IMGFMT_UYVY, MAKEFOURCC('U','Y','V','Y')},
+    {IMGFMT_BGR32, D3DFMT_X8R8G8B8},
+    {IMGFMT_RGB32, D3DFMT_X8B8G8R8},
+    {IMGFMT_BGR24, D3DFMT_R8G8B8}, //untested
+    {IMGFMT_BGR16, D3DFMT_R5G6B5},
+    {IMGFMT_BGR15, D3DFMT_X1R5G5B5},
+    {IMGFMT_BGR8 , D3DFMT_R3G3B2}, //untested
 };
 
 #define DISPLAY_FORMAT_TABLE_ENTRIES \
-- 
cgit v1.2.3


From 669b0697b08ad52641be746a8be501f444858871 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 26 Nov 2008 16:30:42 +0000
Subject: Use D3DFMT_ constants where possible instead of MAKEFOURCC

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28041 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/vo_direct3d.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libvo/vo_direct3d.c b/libvo/vo_direct3d.c
index 610759492e..3b9ce21968 100644
--- a/libvo/vo_direct3d.c
+++ b/libvo/vo_direct3d.c
@@ -88,8 +88,8 @@ static const struct_fmt_table fmt_table[] = {
     {IMGFMT_I420, MAKEFOURCC('I','4','2','0')},
     {IMGFMT_IYUV, MAKEFOURCC('I','Y','U','V')},
     {IMGFMT_YVU9, MAKEFOURCC('Y','V','U','9')},
-    {IMGFMT_YUY2, MAKEFOURCC('Y','U','Y','2')},
-    {IMGFMT_UYVY, MAKEFOURCC('U','Y','V','Y')},
+    {IMGFMT_YUY2,  D3DFMT_YUY2},
+    {IMGFMT_UYVY,  D3DFMT_UYVY},
     {IMGFMT_BGR32, D3DFMT_X8R8G8B8},
     {IMGFMT_RGB32, D3DFMT_X8B8G8R8},
     {IMGFMT_BGR24, D3DFMT_R8G8B8}, //untested
-- 
cgit v1.2.3


From 4d9dd439abd7aced7a6583e73cef46bb7bdd96f3 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 26 Nov 2008 18:17:55 +0000
Subject: Fix compilation after FFmpeg r15940

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

diff --git a/configure b/configure
index ae6f4ceea9..91b1692a01 100755
--- a/configure
+++ b/configure
@@ -8078,6 +8078,7 @@ CONFIG_MDCT=yes
 
 CONFIG_ENCODERS=yes
 CONFIG_GPL=yes
+CONFIG_AANDCT=yes
 CONFIG_LIBAMR=$_libamr
 CONFIG_LIBAMR_NB=$_libamr_nb
 CONFIG_LIBAMR_WB=$_libamr_wb
-- 
cgit v1.2.3


From 189995fb63629eb10751dd15735adb9e30d37192 Mon Sep 17 00:00:00 2001
From: uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 26 Nov 2008 18:49:16 +0000
Subject: configure: Move AANDCT config.mak entry and add config.h #defines

Move the config.mak "CONFIG_AANDCT=yes" line to where other similar
features are, and add missing CONFIG_AANDCT and ENABLE_AANDCT #defines
to config.h (though current FFmpeg code works without them).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28043 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 91b1692a01..041ee87f81 100755
--- a/configure
+++ b/configure
@@ -8071,6 +8071,7 @@ LIBSUF=.a
 LIBNAME=\$(LIBPREF)\$(NAME)\$(LIBSUF)
 
 # Some FFmpeg codecs depend on these. Enable them unconditionally for now.
+CONFIG_AANDCT=yes
 CONFIG_FFT=yes
 CONFIG_FFT_MMX=$fft_mmx
 CONFIG_GOLOMB=yes
@@ -8078,7 +8079,6 @@ CONFIG_MDCT=yes
 
 CONFIG_ENCODERS=yes
 CONFIG_GPL=yes
-CONFIG_AANDCT=yes
 CONFIG_LIBAMR=$_libamr
 CONFIG_LIBAMR_NB=$_libamr_nb
 CONFIG_LIBAMR_WB=$_libamr_wb
@@ -8510,6 +8510,8 @@ $_def_yasm
 #define ENABLE_GRAY 0
 
 /* Some FFmpeg codecs depend on these. Enable them unconditionally for now. */
+#define CONFIG_AANDCT 1
+#define ENABLE_AANDCT 1
 #define CONFIG_FFT 1
 #define ENABLE_FFT 1
 #define CONFIG_GOLOMB 1
-- 
cgit v1.2.3