---
avconv.c | 2 +-
avplay.c | 4 ++--
libavfilter/vsrc_movie.c | 2 --
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/avconv.c b/avconv.c
index d878646..5605c76 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1214,7 +1214,7 @@ static int decode_video(InputStream *ist, AVPacket *pkt,
int *got_output)
}
ist->hwaccel_retrieved_pix_fmt = decoded_frame->format;
- decoded_frame->pts = guess_correct_pts(&ist->pts_ctx,
decoded_frame->pkt_pts,
+ decoded_frame->pts = guess_correct_pts(&ist->pts_ctx, decoded_frame->pts,
decoded_frame->pkt_dts);
pkt->size = 0;
diff --git a/avplay.c b/avplay.c
index c8db03f..5d04b24 100644
--- a/avplay.c
+++ b/avplay.c
@@ -1406,9 +1406,9 @@ static int get_video_frame(PlayerState *is, AVFrame
*frame, int64_t *pts, AVPack
if (got_picture) {
if (decoder_reorder_pts == -1) {
- *pts = guess_correct_pts(&is->pts_ctx, frame->pkt_pts,
frame->pkt_dts);
+ *pts = guess_correct_pts(&is->pts_ctx, frame->pts, frame->pkt_dts);
} else if (decoder_reorder_pts) {
- *pts = frame->pkt_pts;
+ *pts = frame->pts;
} else {
*pts = frame->pkt_dts;
}
diff --git a/libavfilter/vsrc_movie.c b/libavfilter/vsrc_movie.c
index 95ef4f1..5989a59 100644
--- a/libavfilter/vsrc_movie.c
+++ b/libavfilter/vsrc_movie.c
@@ -228,8 +228,6 @@ static int movie_get_frame(AVFilterLink *outlink)
avcodec_decode_video2(movie->codec_ctx, movie->frame,
&frame_decoded, &pkt);
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,
"movie_get_frame(): file:'%s' pts:%"PRId64" time:%f
aspect:%d/%d\n",
movie->file_name, movie->frame->pts,
--
2.0.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
