Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
beb62dac
Commit
beb62dac
authored
Mar 20, 2016
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use AVFrame.pts instead of deprecated pkt_pts.
parent
32c83590
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
5 deletions
+3
-5
avconv.c
avconv.c
+1
-1
avplay.c
avplay.c
+2
-2
vsrc_movie.c
libavfilter/vsrc_movie.c
+0
-2
No files found.
avconv.c
View file @
beb62dac
...
@@ -1279,7 +1279,7 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
...
@@ -1279,7 +1279,7 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
}
}
ist
->
hwaccel_retrieved_pix_fmt
=
decoded_frame
->
format
;
ist
->
hwaccel_retrieved_pix_fmt
=
decoded_frame
->
format
;
decoded_frame
->
pts
=
guess_correct_pts
(
&
ist
->
pts_ctx
,
decoded_frame
->
p
kt_p
ts
,
decoded_frame
->
pts
=
guess_correct_pts
(
&
ist
->
pts_ctx
,
decoded_frame
->
pts
,
decoded_frame
->
pkt_dts
);
decoded_frame
->
pkt_dts
);
if
(
ist
->
st
->
sample_aspect_ratio
.
num
)
if
(
ist
->
st
->
sample_aspect_ratio
.
num
)
...
...
avplay.c
View file @
beb62dac
...
@@ -1406,9 +1406,9 @@ static int get_video_frame(PlayerState *is, AVFrame *frame, int64_t *pts, AVPack
...
@@ -1406,9 +1406,9 @@ static int get_video_frame(PlayerState *is, AVFrame *frame, int64_t *pts, AVPack
if
(
got_picture
)
{
if
(
got_picture
)
{
if
(
decoder_reorder_pts
==
-
1
)
{
if
(
decoder_reorder_pts
==
-
1
)
{
*
pts
=
guess_correct_pts
(
&
is
->
pts_ctx
,
frame
->
p
kt_p
ts
,
frame
->
pkt_dts
);
*
pts
=
guess_correct_pts
(
&
is
->
pts_ctx
,
frame
->
pts
,
frame
->
pkt_dts
);
}
else
if
(
decoder_reorder_pts
)
{
}
else
if
(
decoder_reorder_pts
)
{
*
pts
=
frame
->
p
kt_p
ts
;
*
pts
=
frame
->
pts
;
}
else
{
}
else
{
*
pts
=
frame
->
pkt_dts
;
*
pts
=
frame
->
pkt_dts
;
}
}
...
...
libavfilter/vsrc_movie.c
View file @
beb62dac
...
@@ -228,8 +228,6 @@ static int movie_get_frame(AVFilterLink *outlink)
...
@@ -228,8 +228,6 @@ static int movie_get_frame(AVFilterLink *outlink)
avcodec_decode_video2
(
movie
->
codec_ctx
,
movie
->
frame
,
&
frame_decoded
,
&
pkt
);
avcodec_decode_video2
(
movie
->
codec_ctx
,
movie
->
frame
,
&
frame_decoded
,
&
pkt
);
if
(
frame_decoded
)
{
if
(
frame_decoded
)
{
if
(
movie
->
frame
->
pkt_pts
!=
AV_NOPTS_VALUE
)
movie
->
frame
->
pts
=
movie
->
frame
->
pkt_pts
;
av_log
(
outlink
->
src
,
AV_LOG_TRACE
,
av_log
(
outlink
->
src
,
AV_LOG_TRACE
,
"movie_get_frame(): file:'%s' pts:%"
PRId64
" time:%f aspect:%d/%d
\n
"
,
"movie_get_frame(): file:'%s' pts:%"
PRId64
" time:%f aspect:%d/%d
\n
"
,
movie
->
file_name
,
movie
->
frame
->
pts
,
movie
->
file_name
,
movie
->
frame
->
pts
,
...
...
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