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
92e36ee5
Commit
92e36ee5
authored
Oct 10, 2011
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libmodplug: do not call av_expr_parse() in case of no expr specified.
parent
964465eb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
libmodplug.c
libavformat/libmodplug.c
+7
-5
No files found.
libavformat/libmodplug.c
View file @
92e36ee5
...
...
@@ -167,7 +167,7 @@ static int modplug_read_header(AVFormatContext *s, AVFormatParameters *ap)
AVIOContext
*
pb
=
s
->
pb
;
ModPlug_Settings
settings
;
ModPlugContext
*
modplug
=
s
->
priv_data
;
int
r
,
sz
=
avio_size
(
pb
);
int
sz
=
avio_size
(
pb
);
if
(
sz
<
0
)
{
av_log
(
s
,
AV_LOG_WARNING
,
"Could not determine file size
\n
"
);
...
...
@@ -179,10 +179,12 @@ static int modplug_read_header(AVFormatContext *s, AVFormatParameters *ap)
sz
==
FF_MODPLUG_DEF_FILE_SIZE
?
" (see -max_size)"
:
""
,
sz
);
}
r
=
av_expr_parse
(
&
modplug
->
expr
,
modplug
->
color_eval
,
var_names
,
NULL
,
NULL
,
NULL
,
NULL
,
0
,
s
);
if
(
r
<
0
)
return
r
;
if
(
modplug
->
color_eval
)
{
int
r
=
av_expr_parse
(
&
modplug
->
expr
,
modplug
->
color_eval
,
var_names
,
NULL
,
NULL
,
NULL
,
NULL
,
0
,
s
);
if
(
r
<
0
)
return
r
;
}
modplug
->
buf
=
av_malloc
(
modplug
->
max_size
);
if
(
!
modplug
->
buf
)
...
...
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