summaryrefslogtreecommitdiff
path: root/test/ffmpeg_encoder_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-07-28 14:44:03 +0100
committerCarl Hetherington <cth@carlh.net>2017-07-28 14:44:03 +0100
commit7d651ec877927e0887da48ce441e5c5158e1f34f (patch)
tree656beb7668bd30da427558ac46a250c831c25bb7 /test/ffmpeg_encoder_test.cc
parent06a7c6ee43b1b5cad76ece4c0362d727bcd363ae (diff)
Fix failing test due to header differences.
Diffstat (limited to 'test/ffmpeg_encoder_test.cc')
-rw-r--r--test/ffmpeg_encoder_test.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index c13e991b0..4af823852 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -134,5 +134,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_basic_test_mixdown)
FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_basic_test_mixdown.mp4", FFmpegEncoder::FORMAT_H264, true);
encoder.go ();
- check_file ("build/test/ffmpeg_encoder_basic_test_mixdown.mp4", "test/data/ffmpeg_encoder_basic_test_mixdown.mp4");
+ /* Skip the first video packet when checking as it contains x264 options which can vary between machines
+ (e.g. number of threads used for encoding).
+ */
+ check_ffmpeg ("build/test/ffmpeg_encoder_basic_test_mixdown.mp4", "test/data/ffmpeg_encoder_basic_test_mixdown.mp4", 0);
}