Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
7efbba2e
Commit
7efbba2e
authored
Oct 21, 2012
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cook: use av_get_channel_layout_nb_channels() instead of cook_count_channels()
parent
d21b2e47
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
11 deletions
+1
-11
cook.c
libavcodec/cook.c
+1
-11
No files found.
libavcodec/cook.c
View file @
7efbba2e
...
...
@@ -1034,16 +1034,6 @@ static void dump_cook_context(COOKContext *q)
}
#endif
static
av_cold
int
cook_count_channels
(
unsigned
int
mask
)
{
int
i
;
int
channels
=
0
;
for
(
i
=
0
;
i
<
32
;
i
++
)
if
(
mask
&
(
1
<<
i
))
++
channels
;
return
channels
;
}
/**
* Cook initialization
*
...
...
@@ -1147,7 +1137,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
if
(
extradata_size
>=
4
)
channel_mask
|=
q
->
subpacket
[
s
].
channel_mask
=
bytestream_get_be32
(
&
edata_ptr
);
if
(
cook_count
_channels
(
q
->
subpacket
[
s
].
channel_mask
)
>
1
)
{
if
(
av_get_channel_layout_nb
_channels
(
q
->
subpacket
[
s
].
channel_mask
)
>
1
)
{
q
->
subpacket
[
s
].
total_subbands
=
q
->
subpacket
[
s
].
subbands
+
q
->
subpacket
[
s
].
js_subband_start
;
q
->
subpacket
[
s
].
joint_stereo
=
1
;
...
...
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