projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hide some more FFmpeg warnings.
[dcpomatic.git]
/
src
/
lib
/
filter_graph.h
diff --git
a/src/lib/filter_graph.h
b/src/lib/filter_graph.h
index 00b89d494b5703a563125999fdb54dde6142f3fa..d5a2da7a29be925cbbb6e572544a8390dd2c57ba 100644
(file)
--- a/
src/lib/filter_graph.h
+++ b/
src/lib/filter_graph.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-25,9
+26,12
@@
#define DCPOMATIC_FILTER_GRAPH_H
#include "util.h"
#define DCPOMATIC_FILTER_GRAPH_H
#include "util.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
extern "C" {
#include <libavfilter/buffersink.h>
}
extern "C" {
#include <libavfilter/buffersink.h>
}
+DCPOMATIC_ENABLE_WARNINGS
struct AVFilterContext;
struct AVFrame;
struct AVFilterContext;
struct AVFrame;
@@
-37,19
+41,22
@@
class Filter;
/** @class FilterGraph
* @brief A graph of FFmpeg filters.
*/
/** @class FilterGraph
* @brief A graph of FFmpeg filters.
*/
-class FilterGraph
: public boost::noncopyable
+class FilterGraph
{
public:
FilterGraph ();
virtual ~FilterGraph ();
{
public:
FilterGraph ();
virtual ~FilterGraph ();
+ FilterGraph (FilterGraph const&) = delete;
+ FilterGraph& operator== (FilterGraph const&) = delete;
+
void setup (std::vector<Filter const *>);
AVFilterContext* get (std::string name);
protected:
virtual std::string src_parameters () const = 0;
virtual std::string src_name () const = 0;
void setup (std::vector<Filter const *>);
AVFilterContext* get (std::string name);
protected:
virtual std::string src_parameters () const = 0;
virtual std::string src_name () const = 0;
- virtual void
* sink_parameters (
) const = 0;
+ virtual void
set_parameters (AVFilterContext* context
) const = 0;
virtual std::string sink_name () const = 0;
AVFilterGraph* _graph;
virtual std::string sink_name () const = 0;
AVFilterGraph* _graph;