X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_decoder_seek_test.cc;h=0e5b2963f89d60e6a004654413fb1acc8b87f546;hb=0a3de908ae0f62dd8d7d5aaaa96e2ddab891b5a8;hp=39536f1abfd4537fd3f323cc9ce99ba1c3e6a9c2;hpb=e7e9347cdd1f43e0dd3d1ca35632e9493a010fc6;p=dcpomatic.git diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc index 39536f1ab..0e5b2963f 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