Commit 828f7ab6 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

DMO: blind fix for loader compilation

(cherry picked from commit 5444f9a081fa5cf74b49d4f40e13ea0675d115f5)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent deac747d
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment