Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
a972fc1c
Commit
a972fc1c
authored
Aug 02, 2016
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wma: Kill non-compiling disabled cruft
parent
aa37d2bf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
27 deletions
+0
-27
wma.c
libavcodec/wma.c
+0
-10
wmaenc.c
libavcodec/wmaenc.c
+0
-17
No files found.
libavcodec/wma.c
View file @
a972fc1c
...
...
@@ -276,16 +276,6 @@ av_cold int ff_wma_init(AVCodecContext *avctx, int flags2)
s
->
exponent_high_bands
[
k
][
j
++
]
=
end
-
start
;
}
s
->
exponent_high_sizes
[
k
]
=
j
;
#if 0
ff_tlog(s->avctx, "%5d: coefs_end=%d high_band_start=%d nb_high_bands=%d: ",
s->frame_len >> k,
s->coefs_end[k],
s->high_band_start[k],
s->exponent_high_sizes[k]);
for (j = 0; j < s->exponent_high_sizes[k]; j++)
ff_tlog(s->avctx, " %d", s->exponent_high_bands[k][j]);
ff_tlog(s->avctx, "\n");
#endif /* 0 */
}
}
...
...
libavcodec/wmaenc.c
View file @
a972fc1c
...
...
@@ -386,7 +386,6 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt,
return
ret
;
}
#if 1
total_gain
=
128
;
for
(
i
=
64
;
i
;
i
>>=
1
)
{
int
error
=
encode_frame
(
s
,
s
->
coefs
,
avpkt
->
data
,
avpkt
->
size
,
...
...
@@ -394,22 +393,6 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt,
if
(
error
<
0
)
total_gain
-=
i
;
}
#else
total_gain
=
90
;
best
=
encode_frame
(
s
,
s
->
coefs
,
avpkt
->
data
,
avpkt
->
size
,
total_gain
);
for
(
i
=
32
;
i
;
i
>>=
1
)
{
int
scoreL
=
encode_frame
(
s
,
s
->
coefs
,
avpkt
->
data
,
avpkt
->
size
,
total_gain
-
i
);
int
scoreR
=
encode_frame
(
s
,
s
->
coefs
,
avpkt
->
data
,
avpkt
->
size
,
total_gain
+
i
);
av_log
(
NULL
,
AV_LOG_ERROR
,
"%d %d %d (%d)
\n
"
,
scoreL
,
best
,
scoreR
,
total_gain
);
if
(
scoreL
<
FFMIN
(
best
,
scoreR
))
{
best
=
scoreL
;
total_gain
-=
i
;
}
else
if
(
scoreR
<
best
)
{
best
=
scoreR
;
total_gain
+=
i
;
}
}
#endif
/* 1 */
if
((
i
=
encode_frame
(
s
,
s
->
coefs
,
avpkt
->
data
,
avpkt
->
size
,
total_gain
))
>=
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"required frame size too large. please "
...
...
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