X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg.h;h=95a8bf5d9aa1bb7f860d1365b69bfc7fc550b058;hb=f8755c678d5b4b3d6b31761ef0ec13265190ca0c;hp=43efcf74f456fd031cb900aab1ae3c5d58c65238;hpb=0914bfdbfc498d99821c2cd0ca3a4f9a184d07b5;p=dcpomatic.git diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h index 43efcf74f..95a8bf5d9 100644 --- a/src/lib/ffmpeg.h +++ b/src/lib/ffmpeg.h @@ -1,19 +1,20 @@ /* Copyright (C) 2013-2016 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 . */ @@ -72,7 +73,7 @@ protected: AVFrame* _frame; /** Index of video stream within AVFormatContext */ - int _video_stream; + boost::optional _video_stream; /* It would appear (though not completely verified) that one must have a mutex around calls to avcodec_open* and avcodec_close... and here