Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
613bbb83
Commit
613bbb83
authored
Apr 12, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove "pcm " pseudo-codec, synonymous with "araw"
parent
0e4586e3
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
6 deletions
+2
-6
include/vlc_codecs.h
include/vlc_codecs.h
+1
-1
modules/codec/araw.c
modules/codec/araw.c
+0
-1
modules/demux/wav.c
modules/demux/wav.c
+0
-2
src/misc/fourcc.c
src/misc/fourcc.c
+1
-2
No files found.
include/vlc_codecs.h
View file @
613bbb83
...
...
@@ -433,7 +433,7 @@ static const struct
}
sub_format_tag_to_fourcc
[]
=
{
{
_KSDATAFORMAT_SUBTYPE_PCM_
,
VLC_FOURCC
(
'
p'
,
'c'
,
'm'
,
'
'
),
"PCM"
},
{
_KSDATAFORMAT_SUBTYPE_PCM_
,
VLC_FOURCC
(
'
a'
,
'r'
,
'a'
,
'w
'
),
"PCM"
},
{
_KSDATAFORMAT_SUBTYPE_UNKNOWN_
,
VLC_FOURCC
(
'u'
,
'n'
,
'd'
,
'f'
),
"Unknown"
}
};
...
...
modules/codec/araw.c
View file @
613bbb83
...
...
@@ -111,7 +111,6 @@ static int DecoderOpen( vlc_object_t *p_this )
switch
(
p_dec
->
fmt_in
.
i_codec
)
{
case
VLC_FOURCC
(
'a'
,
'r'
,
'a'
,
'w'
):
case
VLC_FOURCC
(
'p'
,
'c'
,
'm'
,
' '
):
case
VLC_FOURCC
(
'a'
,
'f'
,
'l'
,
't'
):
/* _signed_ big endian samples (mov) */
case
VLC_FOURCC
(
't'
,
'w'
,
'o'
,
's'
):
...
...
modules/demux/wav.c
View file @
613bbb83
...
...
@@ -268,7 +268,6 @@ static int Open( vlc_object_t * p_this )
if
(
p_sys
->
i_channel_mask
)
{
if
(
p_sys
->
fmt
.
i_codec
==
VLC_FOURCC
(
'a'
,
'r'
,
'a'
,
'w'
)
||
p_sys
->
fmt
.
i_codec
==
VLC_FOURCC
(
'p'
,
'c'
,
'm'
,
' '
)
||
p_sys
->
fmt
.
i_codec
==
VLC_FOURCC
(
'a'
,
'f'
,
'l'
,
't'
)
)
p_sys
->
i_chans_to_reorder
=
aout_CheckChannelReorder
(
pi_channels_in
,
NULL
,
...
...
@@ -312,7 +311,6 @@ static int Open( vlc_object_t * p_this )
case
VLC_FOURCC
(
'u'
,
'l'
,
'a'
,
'w'
):
case
VLC_CODEC_ALAW
:
case
VLC_CODEC_MULAW
:
case
VLC_FOURCC
(
'p'
,
'c'
,
'm'
,
' '
):
if
(
FrameInfo_PCM
(
&
p_sys
->
i_frame_size
,
&
p_sys
->
i_frame_samples
,
&
p_sys
->
fmt
)
)
goto
error
;
...
...
src/misc/fourcc.c
View file @
613bbb83
...
...
@@ -1513,8 +1513,7 @@ vlc_fourcc_t vlc_fourcc_GetCodecAudio( vlc_fourcc_t i_fourcc, int i_bits )
return
0
;
}
}
else
if
(
i_fourcc
==
VLC_FOURCC
(
'a'
,
'r'
,
'a'
,
'w'
)
||
i_fourcc
==
VLC_FOURCC
(
'p'
,
'c'
,
'm'
,
' '
)
)
else
if
(
i_fourcc
==
VLC_FOURCC
(
'a'
,
'r'
,
'a'
,
'w'
)
)
{
switch
(
i_bytes
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment