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
35040048
Commit
35040048
authored
Nov 13, 2018
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fftools/ffmpeg: Repair reinit_filter feature
Signed-off-by:
Michael Niedermayer
<
michael@niedermayer.cc
>
parent
d6b1248f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
ffmpeg.c
fftools/ffmpeg.c
+7
-3
No files found.
fftools/ffmpeg.c
View file @
35040048
...
@@ -2132,9 +2132,6 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame)
...
@@ -2132,9 +2132,6 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame)
/* determine if the parameters for this input changed */
/* determine if the parameters for this input changed */
need_reinit
=
ifilter
->
format
!=
frame
->
format
;
need_reinit
=
ifilter
->
format
!=
frame
->
format
;
if
(
!!
ifilter
->
hw_frames_ctx
!=
!!
frame
->
hw_frames_ctx
||
(
ifilter
->
hw_frames_ctx
&&
ifilter
->
hw_frames_ctx
->
data
!=
frame
->
hw_frames_ctx
->
data
))
need_reinit
=
1
;
switch
(
ifilter
->
ist
->
st
->
codecpar
->
codec_type
)
{
switch
(
ifilter
->
ist
->
st
->
codecpar
->
codec_type
)
{
case
AVMEDIA_TYPE_AUDIO
:
case
AVMEDIA_TYPE_AUDIO
:
...
@@ -2148,6 +2145,13 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame)
...
@@ -2148,6 +2145,13 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame)
break
;
break
;
}
}
if
(
!
ifilter
->
ist
->
reinit_filters
&&
fg
->
graph
)
need_reinit
=
0
;
if
(
!!
ifilter
->
hw_frames_ctx
!=
!!
frame
->
hw_frames_ctx
||
(
ifilter
->
hw_frames_ctx
&&
ifilter
->
hw_frames_ctx
->
data
!=
frame
->
hw_frames_ctx
->
data
))
need_reinit
=
1
;
if
(
need_reinit
)
{
if
(
need_reinit
)
{
ret
=
ifilter_parameters_from_frame
(
ifilter
,
frame
);
ret
=
ifilter_parameters_from_frame
(
ifilter
,
frame
);
if
(
ret
<
0
)
if
(
ret
<
0
)
...
...
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