diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-28 20:14:39 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-30 01:13:16 +0200 |
| commit | e39393ee0bc5538b9f98d602d4674f6639a81d8a (patch) | |
| tree | fc505e1a923313176ec0b664a16407dc4229a0d9 | |
| parent | 2a9331ee99f5d7c9d5a1c756c00ea0a9a6c1e228 (diff) | |
Remove some FFmpeg-related warnings by directly accessing AVFrame.
| -rw-r--r-- | src/lib/ffmpeg_examiner.cc | 4 | ||||
| -rw-r--r-- | src/lib/video_filter_graph.cc | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index 39951d139..581fead97 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -278,9 +278,7 @@ FFmpegExaminer::frame_time (AVStream* s) const { optional<ContentTime> t; -DCPOMATIC_DISABLE_WARNINGS - int64_t const bet = av_frame_get_best_effort_timestamp (_frame); -DCPOMATIC_ENABLE_WARNINGS + int64_t const bet = _frame->best_effort_timestamp; if (bet != AV_NOPTS_VALUE) { t = ContentTime::from_seconds (bet * av_q2d (s->time_base)); } diff --git a/src/lib/video_filter_graph.cc b/src/lib/video_filter_graph.cc index f1141150b..c24d9673d 100644 --- a/src/lib/video_filter_graph.cc +++ b/src/lib/video_filter_graph.cc @@ -57,9 +57,8 @@ VideoFilterGraph::process (AVFrame* frame) { list<pair<shared_ptr<Image>, int64_t>> images; -DCPOMATIC_DISABLE_WARNINGS if (_copy) { - images.push_back (make_pair(make_shared<Image>(frame), av_frame_get_best_effort_timestamp (frame))); + images.push_back (make_pair(make_shared<Image>(frame), frame->best_effort_timestamp)); } else { int r = av_buffersrc_write_frame (_buffer_src_context, frame); if (r < 0) { @@ -71,11 +70,10 @@ DCPOMATIC_DISABLE_WARNINGS break; } - images.push_back (make_pair(make_shared<Image>(_frame), av_frame_get_best_effort_timestamp (_frame))); + images.push_back (make_pair(make_shared<Image>(_frame), _frame->best_effort_timestamp)); av_frame_unref (_frame); } } -DCPOMATIC_ENABLE_WARNINGS return images; } |