Merge commit 'beb62dac629603eb074a44c44389c230b5caac7c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Oct 2016 11:16:36 +0000 (13:16 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Oct 2016 11:16:36 +0000 (13:16 +0200)
commit6f74e3cde6147b9a9bda5071e505e9ffbb99096a
treedda765f307f2c19b3af909b35e82b42236c58d46
parent3f9137c57d2344d7613f134128235c18edcede95
parentbeb62dac629603eb074a44c44389c230b5caac7c
Merge commit 'beb62dac629603eb074a44c44389c230b5caac7c'

* commit 'beb62dac629603eb074a44c44389c230b5caac7c':
  Use AVFrame.pts instead of deprecated pkt_pts.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
ffmpeg.c
ffplay.c
ffprobe.c
tests/api/api-h264-test.c
tests/api/api-seek-test.c