Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gabriel Ivăncescu
wine
Commits
98fb7882
Commit
98fb7882
authored
2 years ago
by
Paul Gofman
Committed by
Alexandre Julliard
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
winegstreamer: Route MFAudioFormat_RAW_AAC to mf_media_type_to_wg_format_audio_mpeg4().
parent
bd739062
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/winegstreamer/aac_decoder.c
+0
-2
0 additions, 2 deletions
dlls/winegstreamer/aac_decoder.c
dlls/winegstreamer/gst_private.h
+2
-0
2 additions, 0 deletions
dlls/winegstreamer/gst_private.h
dlls/winegstreamer/mfplat.c
+1
-1
1 addition, 1 deletion
dlls/winegstreamer/mfplat.c
with
3 additions
and
3 deletions
dlls/winegstreamer/aac_decoder.c
+
0
−
2
View file @
98fb7882
...
...
@@ -30,8 +30,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
mfplat
);
WINE_DECLARE_DEBUG_CHANNEL
(
winediag
);
extern
const
GUID
MFAudioFormat_RAW_AAC
;
static
struct
{
const
GUID
*
const
guid
;
...
...
This diff is collapsed.
Click to expand it.
dlls/winegstreamer/gst_private.h
+
2
−
0
View file @
98fb7882
...
...
@@ -148,4 +148,6 @@ HRESULT aac_decoder_create(REFIID riid, void **ret);
HRESULT
h264_decoder_create
(
REFIID
riid
,
void
**
ret
);
HRESULT
video_processor_create
(
REFIID
riid
,
void
**
ret
);
extern
const
GUID
MFAudioFormat_RAW_AAC
;
#endif
/* __GST_PRIVATE_INCLUDED__ */
This diff is collapsed.
Click to expand it.
dlls/winegstreamer/mfplat.c
+
1
−
1
View file @
98fb7882
...
...
@@ -863,7 +863,7 @@ void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format)
IsEqualGUID
(
&
subtype
,
&
MFAudioFormat_WMAudioV9
)
||
IsEqualGUID
(
&
subtype
,
&
MFAudioFormat_WMAudio_Lossless
))
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
);
else
mf_media_type_to_wg_format_audio
(
type
,
&
subtype
,
format
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment