diff options
| author |   Eric Hameleers <alien@slackware.com> | 2012-10-18 17:30:12 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2012-10-18 17:30:12 +0000 |
| commit | 1eb8b596de2fdf148e1cf79a854de5020551cbac (patch) | |
| tree | 589231961cd2afe90e32196064411045383c557e /vlc | |
| parent | 7d793e28bbafbead31059520759e27af438234c5 (diff) | |
| download | asb-1eb8b596de2fdf148e1cf79a854de5020551cbac.tar.gz asb-1eb8b596de2fdf148e1cf79a854de5020551cbac.tar.xz | |
Initial revision
Diffstat (limited to 'vlc')
| -rw-r--r-- | vlc/build/vlc-2.0.4_dmo.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/vlc/build/vlc-2.0.4_dmo.patch b/vlc/build/vlc-2.0.4_dmo.patch new file mode 100644 index 00000000..5a81dce7 --- /dev/null +++ b/vlc/build/vlc-2.0.4_dmo.patch @@ -0,0 +1,48 @@ +From 828f7ab6338996d69d23c9d651a63ed30900dae6 Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Kempf <jb@videolan.org> +Date: Thu, 13 Sep 2012 17:51:03 +0200 +Subject: [PATCH] DMO: blind fix for loader compilation (cherry picked from + commit 5444f9a081fa5cf74b49d4f40e13ea0675d115f5) + +Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> +--- + modules/codec/dmo/dmo.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c +index 662f855..5eeb6a3 100644 +--- a/modules/codec/dmo/dmo.c ++++ b/modules/codec/dmo/dmo.c +@@ -179,6 +179,10 @@ static const GUID guid_wma_enc = { 0x70f598e9, 0xf4ab, 0x495a, { 0x99, 0xe2, 0xa + #define VLC_CODEC_MSS1 VLC_FOURCC('M','S','S','1') + #define VLC_CODEC_MSS2 VLC_FOURCC('M','S','S','2') + ++#ifndef BI_RGB ++# define BI_RGB 0x0 ++#endif ++ + typedef struct + { + vlc_fourcc_t i_fourcc; +@@ -526,7 +530,7 @@ static int DecOpen( decoder_t *p_dec ) + + DMOFreeMediaType( &mt ); + } +- ++ + p_dec->fmt_out.i_codec = i_chroma == VLC_CODEC_YV12 ? VLC_CODEC_I420 : i_chroma; + p_dec->fmt_out.video.i_width = p_dec->fmt_in.video.i_width; + p_dec->fmt_out.video.i_height = p_dec->fmt_in.video.i_height; +@@ -562,7 +566,7 @@ static int DecOpen( decoder_t *p_dec ) + { + dmo_output_type.subtype = MEDIASUBTYPE_RGB24; + } +- else ++ else + { + dmo_output_type.subtype = dmo_output_type.majortype; + dmo_output_type.subtype.Data1 = p_bih->biCompression; +-- +1.7.10.4 + + |