projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace aligned bool with enum Alignment.
[dcpomatic.git]
/
src
/
lib
/
video_filter_graph.cc
diff --git
a/src/lib/video_filter_graph.cc
b/src/lib/video_filter_graph.cc
index a61da6773bbb8517330895aa2a8b01eae3e39c76..0c7e23b050b2e2b0fe6b98940616df0c83a62529 100644
(file)
--- a/
src/lib/video_filter_graph.cc
+++ b/
src/lib/video_filter_graph.cc
@@
-38,7
+38,6
@@
using std::make_shared;
using std::pair;
using std::shared_ptr;
using std::string;
using std::pair;
using std::shared_ptr;
using std::string;
-using std::vector;
VideoFilterGraph::VideoFilterGraph (dcp::Size s, AVPixelFormat p, dcp::Fraction r)
VideoFilterGraph::VideoFilterGraph (dcp::Size s, AVPixelFormat p, dcp::Fraction r)
@@
-59,7
+58,7
@@
VideoFilterGraph::process (AVFrame* frame)
list<pair<shared_ptr<Image>, int64_t>> images;
if (_copy) {
list<pair<shared_ptr<Image>, int64_t>> images;
if (_copy) {
- images.push_back (make_pair(make_shared<Image>(frame), frame->best_effort_timestamp));
+ images.push_back (make_pair(make_shared<Image>(frame
, Image::Alignment::PADDED
), frame->best_effort_timestamp));
} else {
int r = av_buffersrc_write_frame (_buffer_src_context, frame);
if (r < 0) {
} else {
int r = av_buffersrc_write_frame (_buffer_src_context, frame);
if (r < 0) {
@@
-71,7
+70,7
@@
VideoFilterGraph::process (AVFrame* frame)
break;
}
break;
}
- images.push_back (make_pair(make_shared<Image>(_frame), frame->best_effort_timestamp));
+ images.push_back (make_pair(make_shared<Image>(_frame
, Image::Alignment::PADDED
), frame->best_effort_timestamp));
av_frame_unref (_frame);
}
}
av_frame_unref (_frame);
}
}