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
9606f19b
Commit
9606f19b
authored
Aug 25, 2012
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adpcmenc: fix 3 instances of variable shadowing
parent
1e35574b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
adpcmenc.c
libavcodec/adpcmenc.c
+2
-3
No files found.
libavcodec/adpcmenc.c
View file @
9606f19b
...
@@ -546,7 +546,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
...
@@ -546,7 +546,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
}
}
case
AV_CODEC_ID_ADPCM_IMA_QT
:
case
AV_CODEC_ID_ADPCM_IMA_QT
:
{
{
int
ch
,
i
;
int
ch
;
PutBitContext
pb
;
PutBitContext
pb
;
init_put_bits
(
&
pb
,
dst
,
pkt_size
*
8
);
init_put_bits
(
&
pb
,
dst
,
pkt_size
*
8
);
...
@@ -576,7 +576,6 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
...
@@ -576,7 +576,6 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
}
}
case
AV_CODEC_ID_ADPCM_SWF
:
case
AV_CODEC_ID_ADPCM_SWF
:
{
{
int
i
;
PutBitContext
pb
;
PutBitContext
pb
;
init_put_bits
(
&
pb
,
dst
,
pkt_size
*
8
);
init_put_bits
(
&
pb
,
dst
,
pkt_size
*
8
);
...
@@ -641,7 +640,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
...
@@ -641,7 +640,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
bytestream_put_le16
(
&
dst
,
c
->
status
[
i
].
sample2
);
bytestream_put_le16
(
&
dst
,
c
->
status
[
i
].
sample2
);
if
(
avctx
->
trellis
>
0
)
{
if
(
avctx
->
trellis
>
0
)
{
int
n
=
avctx
->
block_align
-
7
*
avctx
->
channels
;
n
=
avctx
->
block_align
-
7
*
avctx
->
channels
;
FF_ALLOC_OR_GOTO
(
avctx
,
buf
,
2
*
n
,
error
);
FF_ALLOC_OR_GOTO
(
avctx
,
buf
,
2
*
n
,
error
);
if
(
avctx
->
channels
==
1
)
{
if
(
avctx
->
channels
==
1
)
{
adpcm_compress_trellis
(
avctx
,
samples
,
buf
,
&
c
->
status
[
0
],
n
);
adpcm_compress_trellis
(
avctx
,
samples
,
buf
,
&
c
->
status
[
0
],
n
);
...
...
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