projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporter.
[dcpomatic.git]
/
test
/
ffmpeg_decoder_seek_test.cc
diff --git
a/test/ffmpeg_decoder_seek_test.cc
b/test/ffmpeg_decoder_seek_test.cc
index 5e310cd3c34ca75de5ea2c0555e0a3a272731c7f..0e5b2963f89d60e6a004654413fb1acc8b87f546 100644
(file)
--- a/
test/ffmpeg_decoder_seek_test.cc
+++ b/
test/ffmpeg_decoder_seek_test.cc
@@
-35,14
+35,12
@@
#include "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp>
#include "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp>
-#include <boost/make_shared.hpp>
#include <vector>
using std::cerr;
using std::vector;
using std::list;
using boost::shared_ptr;
#include <vector>
using std::cerr;
using std::vector;
using std::list;
using boost::shared_ptr;
-using boost::make_shared;
using boost::optional;
static void
using boost::optional;
static void
@@
-64,11
+62,11
@@
test (boost::filesystem::path file, vector<int> frames)
}
shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
}
shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
- shared_ptr<FFmpegContent> content
= make_shared<FFmpegContent> (film, path
);
+ shared_ptr<FFmpegContent> content
(new FFmpegContent (film, path)
);
film->examine_and_add_content (content);
wait_for_jobs ();
film->examine_and_add_content (content);
wait_for_jobs ();
- shared_ptr<Log> log
= make_shared<NullLog> (
);
- shared_ptr<FFmpegDecoder> decoder
= make_shared<FFmpegDecoder> (content, log, false
);
+ shared_ptr<Log> log
(new NullLog
);
+ shared_ptr<FFmpegDecoder> decoder
(new FFmpegDecoder (content, log)
);
for (vector<int>::const_iterator i = frames.begin(); i != frames.end(); ++i) {
check (decoder, *i);
for (vector<int>::const_iterator i = frames.begin(); i != frames.end(); ++i) {
check (decoder, *i);