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
67d3f529
Commit
67d3f529
authored
Oct 22, 2015
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/fifo: do not assume request_frame() returns a frame.
parent
79c1be12
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
fifo.c
libavfilter/fifo.c
+4
-2
No files found.
libavfilter/fifo.c
View file @
67d3f529
...
@@ -201,7 +201,8 @@ static int return_audio_frame(AVFilterContext *ctx)
...
@@ -201,7 +201,8 @@ static int return_audio_frame(AVFilterContext *ctx)
break
;
break
;
}
else
if
(
ret
<
0
)
}
else
if
(
ret
<
0
)
return
ret
;
return
ret
;
av_assert0
(
s
->
root
.
next
);
// If ff_request_frame() succeeded then we should have a frame
if
(
!
s
->
root
.
next
)
return
0
;
}
}
head
=
s
->
root
.
next
->
frame
;
head
=
s
->
root
.
next
->
frame
;
...
@@ -237,7 +238,8 @@ static int request_frame(AVFilterLink *outlink)
...
@@ -237,7 +238,8 @@ static int request_frame(AVFilterLink *outlink)
return
return_audio_frame
(
outlink
->
src
);
return
return_audio_frame
(
outlink
->
src
);
return
ret
;
return
ret
;
}
}
av_assert0
(
fifo
->
root
.
next
);
if
(
!
fifo
->
root
.
next
)
return
0
;
}
}
if
(
outlink
->
request_samples
)
{
if
(
outlink
->
request_samples
)
{
...
...
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