mirror of
https://github.com/librempeg/librempeg
synced 2024-11-23 11:39:47 +00:00
Use AVFrame.pts instead of deprecated pkt_pts.
This commit is contained in:
parent
32c8359093
commit
beb62dac62
2
avconv.c
2
avconv.c
@ -1279,7 +1279,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);
|
||||
|
||||
if (ist->st->sample_aspect_ratio.num)
|
||||
|
4
avplay.c
4
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;
|
||||
}
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user