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
8c4022ac
Commit
8c4022ac
authored
Apr 21, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avconv: fix a segfault on -c copy with -filter_complex.
parent
462a5b78
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
avconv.c
avconv.c
+12
-1
No files found.
avconv.c
View file @
8c4022ac
...
...
@@ -2612,7 +2612,11 @@ static int transcode_init(void)
}
if
(
ost
->
stream_copy
)
{
uint64_t
extra_size
=
(
uint64_t
)
icodec
->
extradata_size
+
FF_INPUT_BUFFER_PADDING_SIZE
;
uint64_t
extra_size
;
av_assert0
(
ist
&&
!
ost
->
filter
);
extra_size
=
(
uint64_t
)
icodec
->
extradata_size
+
FF_INPUT_BUFFER_PADDING_SIZE
;
if
(
extra_size
>
INT_MAX
)
{
return
AVERROR
(
EINVAL
);
...
...
@@ -4194,6 +4198,13 @@ static void init_output_filter(OutputFilter *ofilter, OptionsContext *o,
ofilter
->
ost
=
ost
;
if
(
ost
->
stream_copy
)
{
av_log
(
NULL
,
AV_LOG_ERROR
,
"Streamcopy requested for output stream %d:%d, "
"which is fed from a complex filtergraph. Filtering and streamcopy "
"cannot be used together.
\n
"
,
ost
->
file_index
,
ost
->
index
);
exit_program
(
1
);
}
if
(
configure_output_filter
(
ofilter
->
graph
,
ofilter
,
ofilter
->
out_tmp
)
<
0
)
{
av_log
(
NULL
,
AV_LOG_FATAL
,
"Error configuring filter.
\n
"
);
exit_program
(
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