X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilter.cc;h=8bf1d0abd4fd35bbb7a967ad59e00500c041289f;hb=a7f61a15;hp=5631af55a8885a5d1e6a02cad27d1cb7e85bd9a8;hpb=607a824efbcb0ae9d5b664e919ae983224e712a0;p=dcpomatic.git

diff --git a/src/lib/filter.cc b/src/lib/filter.cc
index 5631af55a..8bf1d0abd 100644
--- a/src/lib/filter.cc
+++ b/src/lib/filter.cc
@@ -39,7 +39,7 @@ DCPOMATIC_ENABLE_WARNINGS
 using namespace std;
 
 
-vector<Filter const *> Filter::_filters;
+vector<Filter> Filter::_filters;
 
 
 /** @param i Our id.
@@ -61,7 +61,11 @@ Filter::Filter (string i, string n, string c, string f)
 vector<Filter const *>
 Filter::all ()
 {
-	return _filters;
+	vector<Filter const *> raw;
+	for (auto& filter: _filters) {
+		raw.push_back (&filter);
+	}
+	return raw;
 }
 
 
@@ -101,7 +105,7 @@ Filter::maybe_add (string i, string n, string c, string f)
 	}
 
 	if (avfilter_get_by_name(check_name.c_str())) {
-		_filters.push_back (new Filter(i, n, c, f));
+		_filters.push_back (Filter(i, n, c, f));
 	}
 }
 
@@ -132,7 +136,7 @@ Filter const *
 Filter::from_id (string d)
 {
 	auto i = _filters.begin ();
-	while (i != _filters.end() && (*i)->id() != d) {
+	while (i != _filters.end() && i->id() != d) {
 		++i;
 	}
 
@@ -140,5 +144,5 @@ Filter::from_id (string d)
 		return nullptr;
 	}
 
-	return *i;
+	return &(*i);
 }