diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-10-07 13:16:36 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-10-07 13:16:36 +0200 |
| commit | 6f74e3cde6147b9a9bda5071e505e9ffbb99096a (patch) | |
| tree | dda765f307f2c19b3af909b35e82b42236c58d46 /tests/api | |
| parent | 3f9137c57d2344d7613f134128235c18edcede95 (diff) | |
| parent | beb62dac629603eb074a44c44389c230b5caac7c (diff) | |
| download | ffmpeg-6f74e3cde6147b9a9bda5071e505e9ffbb99096a.tar.gz | |
Merge commit 'beb62dac629603eb074a44c44389c230b5caac7c'
* commit 'beb62dac629603eb074a44c44389c230b5caac7c':
Use AVFrame.pts instead of deprecated pkt_pts.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'tests/api')
| -rw-r--r-- | tests/api/api-h264-test.c | 2 | ||||
| -rw-r--r-- | tests/api/api-seek-test.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/api/api-h264-test.c b/tests/api/api-h264-test.c index ef3a1fefff..7bdf92bb89 100644 --- a/tests/api/api-h264-test.c +++ b/tests/api/api-h264-test.c @@ -132,7 +132,7 @@ static int video_decode_example(const char *input_filename) return number_of_written_bytes; } printf("%d, %10"PRId64", %10"PRId64", %8"PRId64", %8d, 0x%08lx\n", video_stream, - fr->pkt_pts, fr->pkt_dts, av_frame_get_pkt_duration(fr), + fr->pts, fr->pkt_dts, av_frame_get_pkt_duration(fr), number_of_written_bytes, av_adler32_update(0, (const uint8_t*)byte_buffer, number_of_written_bytes)); } av_packet_unref(&pkt); diff --git a/tests/api/api-seek-test.c b/tests/api/api-seek-test.c index df47a5fbdb..8117df46fd 100644 --- a/tests/api/api-seek-test.c +++ b/tests/api/api-seek-test.c @@ -129,23 +129,23 @@ static int compute_crc_of_packets(AVFormatContext *fmt_ctx, int video_stream, av_log(NULL, AV_LOG_ERROR, "Can't copy image to buffer\n"); return number_of_written_bytes; } - if ((fr->pkt_pts > ts_end) && (!no_seeking)) + if ((fr->pts > ts_end) && (!no_seeking)) break; crc = av_adler32_update(0, (const uint8_t*)byte_buffer, number_of_written_bytes); - printf("%10"PRId64", 0x%08lx\n", fr->pkt_pts, crc); + printf("%10"PRId64", 0x%08lx\n", fr->pts, crc); if (no_seeking) { - if (add_crc_to_array(crc, fr->pkt_pts) < 0) + if (add_crc_to_array(crc, fr->pts) < 0) return -1; } else { - if (compare_crc_in_array(crc, fr->pkt_pts) < 0) + if (compare_crc_in_array(crc, fr->pts) < 0) return -1; } } } av_packet_unref(&pkt); av_init_packet(&pkt); - } while ((!end_of_stream || got_frame) && (no_seeking || (fr->pkt_pts + av_frame_get_pkt_duration(fr) <= ts_end))); + } while ((!end_of_stream || got_frame) && (no_seeking || (fr->pts + av_frame_get_pkt_duration(fr) <= ts_end))); av_packet_unref(&pkt); av_freep(&byte_buffer); |