diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-26 20:53:53 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-26 20:53:53 +0200 |
| commit | 62dda60800a902fdaf9b0ec63d8488aaa48c485f (patch) | |
| tree | a6333f789a4d7f7deb7e3cf8dded697f9350f751 | |
| parent | 835511ac394d5283c9c449e6154ccb0db1365321 (diff) | |
| parent | 189995fb63629eb10751dd15735adb9e30d37192 (diff) | |
| download | mpv-62dda60800a902fdaf9b0ec63d8488aaa48c485f.tar.bz2 mpv-62dda60800a902fdaf9b0ec63d8488aaa48c485f.tar.xz | |
Merge svn changes up to r28043
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | etc/codecs.conf | 2 | ||||
| -rw-r--r-- | libvo/vo_direct3d.c | 10 |
3 files changed, 12 insertions, 3 deletions
@@ -8074,6 +8074,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 @@ -8512,6 +8513,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 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 diff --git a/libvo/vo_direct3d.c b/libvo/vo_direct3d.c index 78b8dbc159..3b9ce21968 100644 --- a/libvo/vo_direct3d.c +++ b/libvo/vo_direct3d.c @@ -88,8 +88,14 @@ 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 + {IMGFMT_BGR16, D3DFMT_R5G6B5}, + {IMGFMT_BGR15, D3DFMT_X1R5G5B5}, + {IMGFMT_BGR8 , D3DFMT_R3G3B2}, //untested }; #define DISPLAY_FORMAT_TABLE_ENTRIES \ |