summaryrefslogtreecommitdiff
path: root/test/ffmpeg_decoder_sequential_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-08-26 19:45:37 +0100
committerCarl Hetherington <cth@carlh.net>2015-08-26 19:45:37 +0100
commite7e9347cdd1f43e0dd3d1ca35632e9493a010fc6 (patch)
tree4ec010d7ccb168cdaae3da236600469862dfdf2c /test/ffmpeg_decoder_sequential_test.cc
parentdd8a7d1bbb8f2afb1b98d2be856ff0a9920e180d (diff)
Split log.{cc,h}.
Diffstat (limited to 'test/ffmpeg_decoder_sequential_test.cc')
-rw-r--r--test/ffmpeg_decoder_sequential_test.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 601dd1c59..ce799bb24 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -22,13 +22,13 @@
* (dropped frames being checked by assert() in VideoDecoder). Also that the decoder picks up frame rates correctly.
*/
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
#include "lib/ffmpeg_content.h"
#include "lib/ffmpeg_decoder.h"
-#include "lib/log.h"
+#include "lib/null_log.h"
#include "lib/film.h"
#include "test.h"
+#include <boost/filesystem.hpp>
+#include <boost/test/unit_test.hpp>
using std::cout;
using std::cerr;
@@ -78,4 +78,3 @@ BOOST_AUTO_TEST_CASE (ffmpeg_decoder_sequential_test)
*/
test ("prophet_clip.mkv", 23.976, 12);
}
-