From: Rémi Bernon rbernon@codeweavers.com
--- dlls/winedmo/unix_media_type.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/winedmo/unix_media_type.c b/dlls/winedmo/unix_media_type.c index fac3a82e8c9..fe3060eaea7 100644 --- a/dlls/winedmo/unix_media_type.c +++ b/dlls/winedmo/unix_media_type.c @@ -67,7 +67,7 @@ static inline const char *debugstr_area( const MFVideoArea *area ) } \ } while (0)
-static WORD wave_format_tag_from_codec_id( enum AVCodecID id ) +static UINT wave_format_tag_from_codec_id( enum AVCodecID id ) { const struct AVCodecTag *table[] = {avformat_get_riff_audio_tags(), avformat_get_mov_audio_tags(), 0}; return av_codec_get_tag( table, id ); @@ -161,9 +161,8 @@ static NTSTATUS heaac_wave_format_from_codec_params( const AVCodecParameters *pa
static NTSTATUS audio_format_from_codec_params( const AVCodecParameters *params, void *format, UINT32 *format_size ) { - UINT wave_format_size = sizeof(WAVEFORMATEX); + UINT format_tag, wave_format_size = sizeof(WAVEFORMATEX); UINT64 channel_mask; - WORD format_tag; int channels;
if (params->codec_id == AV_CODEC_ID_AAC) return heaac_wave_format_from_codec_params( params, format, format_size );