projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore FFmpeg warnings in a nicer way.
[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 6075500e9d9148f5af103e9f56f6034dbdc3ab58..9b297c87bf63549e6736b1134e168c650bd1c026 100644
(file)
--- a/
src/lib/video_filter_graph.cc
+++ b/
src/lib/video_filter_graph.cc
@@
-18,9
+18,10
@@
*/
*/
-#include "video_filter_graph.h"
-#include "image.h"
#include "compose.hpp"
#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>
@@
-51,6
+52,7
@@
VideoFilterGraph::process (AVFrame* frame)
{
list<pair<shared_ptr<Image>, int64_t> > images;
{
list<pair<shared_ptr<Image>, int64_t> > images;
+DCPOMATIC_DISABLE_WARNINGS
if (_copy) {
images.push_back (make_pair (shared_ptr<Image> (new Image (frame)), av_frame_get_best_effort_timestamp (frame)));
} else {
if (_copy) {
images.push_back (make_pair (shared_ptr<Image> (new Image (frame)), av_frame_get_best_effort_timestamp (frame)));
} else {
@@
-68,6
+70,7
@@
VideoFilterGraph::process (AVFrame* frame)
av_frame_unref (_frame);
}
}
av_frame_unref (_frame);
}
}
+DCPOMATIC_ENABLE_WARNINGS
return images;
}
return images;
}