X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_decoder_seek_test.cc;h=8a854b01b7e0d8671d5e7ee3f7646730e1eceb99;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hp=2a9b4da715ed35ef2cab298f8b654a2759911157;hpb=c0503d4121ffead6a3adb745b167191cd006b4a3;p=dcpomatic.git diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc index 2a9b4da71..8a854b01b 100644 --- a/test/ffmpeg_decoder_seek_test.cc +++ b/test/ffmpeg_decoder_seek_test.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2014-2015 Carl Hetherington - 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. - 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 - 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 . */ @@ -29,6 +30,8 @@ #include "lib/ffmpeg_decoder.h" #include "lib/null_log.h" #include "lib/film.h" +#include "lib/content_video.h" +#include "lib/video_decoder.h" #include "test.h" #include #include @@ -44,9 +47,9 @@ static void check (shared_ptr decoder, int frame) { list v; - v = decoder->get_video (frame, true); + v = decoder->video->get (frame, true); BOOST_CHECK (v.size() == 1); - BOOST_CHECK_EQUAL (v.front().frame, frame); + BOOST_CHECK_EQUAL (v.front().frame.index(), frame); } static void