projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in log message.
[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 b4198da723832a57b889e1eb94788ef81630e3c2..1cc1425202d190f6c5937a16fb4fd29d209bd7a1 100644
(file)
--- a/
src/lib/video_filter_graph.cc
+++ b/
src/lib/video_filter_graph.cc
@@
-22,7
+22,6
@@
#include "compose.hpp"
#include "image.h"
#include "video_filter_graph.h"
#include "compose.hpp"
#include "image.h"
#include "video_filter_graph.h"
-#include "warnings.h"
extern "C" {
#include <libavfilter/buffersrc.h>
#include <libavfilter/buffersink.h>
extern "C" {
#include <libavfilter/buffersrc.h>
#include <libavfilter/buffersink.h>
@@
-38,7
+37,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
+57,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,
true
), 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
+69,7
@@
VideoFilterGraph::process (AVFrame* frame)
break;
}
break;
}
- images.push_back (make_pair(make_shared<Image>(_frame,
true
), 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);
}
}