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
105d4748
Commit
105d4748
authored
Oct 27, 2013
by
Marton Balint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffplay: avoid code duplication in AVFILTER enabled and disabled case
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
87434cf3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
ffplay.c
ffplay.c
+5
-6
No files found.
ffplay.c
View file @
105d4748
...
...
@@ -1911,6 +1911,7 @@ static int video_thread(void *arg)
double
pts
;
int
ret
;
int
serial
=
0
;
AVRational
tb
=
is
->
video_st
->
time_base
;
#if CONFIG_AVFILTER
AVFilterGraph
*
graph
=
avfilter_graph_alloc
();
...
...
@@ -1984,15 +1985,13 @@ static int video_thread(void *arg)
is
->
frame_last_filter_delay
=
av_gettime
()
/
1000000
.
0
-
is
->
frame_last_returned_time
;
if
(
fabs
(
is
->
frame_last_filter_delay
)
>
AV_NOSYNC_THRESHOLD
/
10
.
0
)
is
->
frame_last_filter_delay
=
0
;
pts
=
(
frame
->
pts
==
AV_NOPTS_VALUE
)
?
NAN
:
frame
->
pts
*
av_q2d
(
filt_out
->
inputs
[
0
]
->
time_base
);
tb
=
filt_out
->
inputs
[
0
]
->
time_base
;
#endif
pts
=
(
frame
->
pts
==
AV_NOPTS_VALUE
)
?
NAN
:
frame
->
pts
*
av_q2d
(
tb
);
ret
=
queue_picture
(
is
,
frame
,
pts
,
av_frame_get_pkt_pos
(
frame
),
serial
);
av_frame_unref
(
frame
);
#if CONFIG_AVFILTER
}
#else
pts
=
(
frame
->
pts
==
AV_NOPTS_VALUE
)
?
NAN
:
frame
->
pts
*
av_q2d
(
is
->
video_st
->
time_base
);
ret
=
queue_picture
(
is
,
frame
,
pts
,
av_frame_get_pkt_pos
(
frame
),
serial
);
av_frame_unref
(
frame
);
#endif
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