projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Use make_shared<>."
[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 b6b3c2668095c444d77c74fd6ae9b4d59ac9a777..201150560bb1ffaae82a7c72e8c97c3682a2eab1 100644
(file)
--- a/
src/lib/video_filter_graph.cc
+++ b/
src/lib/video_filter_graph.cc
@@
-25,7
+25,6
@@
extern "C" {
#include <libavfilter/buffersrc.h>
#include <libavfilter/buffersink.h>
}
#include <libavfilter/buffersrc.h>
#include <libavfilter/buffersink.h>
}
-#include <boost/make_shared.hpp>
#include "i18n.h"
#include "i18n.h"
@@
-35,7
+34,6
@@
using std::vector;
using std::string;
using std::make_pair;
using boost::shared_ptr;
using std::string;
using std::make_pair;
using boost::shared_ptr;
-using boost::make_shared;
VideoFilterGraph::VideoFilterGraph (dcp::Size s, AVPixelFormat p)
: _size (s)
VideoFilterGraph::VideoFilterGraph (dcp::Size s, AVPixelFormat p)
: _size (s)
@@
-53,7
+51,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
), av_frame_get_best_effort_timestamp (frame)));
+ images.push_back (make_pair (
shared_ptr<Image> (new Image (frame)
), av_frame_get_best_effort_timestamp (frame)));
} 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) {
@@
-65,7
+63,7
@@
VideoFilterGraph::process (AVFrame* frame)
break;
}
break;
}
- images.push_back (make_pair (
make_shared<Image> (_frame
), av_frame_get_best_effort_timestamp (_frame)));
+ images.push_back (make_pair (
shared_ptr<Image> (new Image (_frame)
), av_frame_get_best_effort_timestamp (_frame)));
av_frame_unref (_frame);
}
}
av_frame_unref (_frame);
}
}
@@
-119,3
+117,4
@@
VideoFilterGraph::sink_name () const
{
return "buffersink";
}
{
return "buffersink";
}
+