Commit 98fb7882 authored by Paul Gofman's avatar Paul Gofman Committed by Alexandre Julliard

winegstreamer: Route MFAudioFormat_RAW_AAC to mf_media_type_to_wg_format_audio_mpeg4().

parent bd739062
...@@ -30,8 +30,6 @@ ...@@ -30,8 +30,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(mfplat); WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
WINE_DECLARE_DEBUG_CHANNEL(winediag); WINE_DECLARE_DEBUG_CHANNEL(winediag);
extern const GUID MFAudioFormat_RAW_AAC;
static struct static struct
{ {
const GUID *const guid; const GUID *const guid;
......
...@@ -148,4 +148,6 @@ HRESULT aac_decoder_create(REFIID riid, void **ret); ...@@ -148,4 +148,6 @@ HRESULT aac_decoder_create(REFIID riid, void **ret);
HRESULT h264_decoder_create(REFIID riid, void **ret); HRESULT h264_decoder_create(REFIID riid, void **ret);
HRESULT video_processor_create(REFIID riid, void **ret); HRESULT video_processor_create(REFIID riid, void **ret);
extern const GUID MFAudioFormat_RAW_AAC;
#endif /* __GST_PRIVATE_INCLUDED__ */ #endif /* __GST_PRIVATE_INCLUDED__ */
...@@ -863,7 +863,7 @@ void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format) ...@@ -863,7 +863,7 @@ void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format)
IsEqualGUID(&subtype, &MFAudioFormat_WMAudioV9) || IsEqualGUID(&subtype, &MFAudioFormat_WMAudioV9) ||
IsEqualGUID(&subtype, &MFAudioFormat_WMAudio_Lossless)) IsEqualGUID(&subtype, &MFAudioFormat_WMAudio_Lossless))
mf_media_type_to_wg_format_audio_wma(type, &subtype, format); mf_media_type_to_wg_format_audio_wma(type, &subtype, format);
else if (IsEqualGUID(&subtype, &MFAudioFormat_AAC)) else if (IsEqualGUID(&subtype, &MFAudioFormat_AAC) || IsEqualGUID(&subtype, &MFAudioFormat_RAW_AAC))
mf_media_type_to_wg_format_audio_mpeg4(type, format); mf_media_type_to_wg_format_audio_mpeg4(type, format);
else else
mf_media_type_to_wg_format_audio(type, &subtype, format); mf_media_type_to_wg_format_audio(type, &subtype, format);
......
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