summaryrefslogtreecommitdiff
path: root/ffprobe.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-10-07 13:16:36 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2016-10-07 13:16:36 +0200
commit6f74e3cde6147b9a9bda5071e505e9ffbb99096a (patch)
treedda765f307f2c19b3af909b35e82b42236c58d46 /ffprobe.c
parent3f9137c57d2344d7613f134128235c18edcede95 (diff)
parentbeb62dac629603eb074a44c44389c230b5caac7c (diff)
Merge commit 'beb62dac629603eb074a44c44389c230b5caac7c'
* commit 'beb62dac629603eb074a44c44389c230b5caac7c': Use AVFrame.pts instead of deprecated pkt_pts. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'ffprobe.c')
-rw-r--r--ffprobe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffprobe.c b/ffprobe.c
index bb3979c98b..662137c704 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1884,8 +1884,8 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream,
else print_str_opt("media_type", "unknown");
print_int("stream_index", stream->index);
print_int("key_frame", frame->key_frame);
- print_ts ("pkt_pts", frame->pkt_pts);
- print_time("pkt_pts_time", frame->pkt_pts, &stream->time_base);
+ print_ts ("pkt_pts", frame->pts);
+ print_time("pkt_pts_time", frame->pts, &stream->time_base);
print_ts ("pkt_dts", frame->pkt_dts);
print_time("pkt_dts_time", frame->pkt_dts, &stream->time_base);
print_ts ("best_effort_timestamp", av_frame_get_best_effort_timestamp(frame));