X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle.cc;h=b4ac14285714b1e085a9fffcee5d80daf1906fc9;hb=7deb94e3cb9048891664f74d9c8a534ca6a24748;hp=c52d3ac664891576a1cced625da24bc678001f73;hpb=dedac27070ac5ad65265a0db1fa316b3e436cea7;p=dcpomatic.git diff --git a/src/lib/subtitle.cc b/src/lib/subtitle.cc index c52d3ac66..b4ac14285 100644 --- a/src/lib/subtitle.cc +++ b/src/lib/subtitle.cc @@ -34,7 +34,7 @@ using namespace boost; */ TimedSubtitle::TimedSubtitle (AVSubtitle const & sub) { - assert (sub.rects > 0); + assert (sub.num_rects > 0); /* Subtitle PTS in seconds (within the source, not taking into account any of the source that we may have chopped off for the DCP) @@ -55,7 +55,7 @@ TimedSubtitle::TimedSubtitle (AVSubtitle const & sub) throw DecodeError ("non-bitmap subtitles not yet supported"); } - shared_ptr image (new SimpleImage (PIX_FMT_RGBA, Size (rect->w, rect->h), true)); + shared_ptr image (new SimpleImage (PIX_FMT_RGBA, libdcp::Size (rect->w, rect->h), true)); /* Start of the first line in the subtitle */ uint8_t* sub_p = rect->pict.data[0];