X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=5cbe884ec8bd43f42daf28da1724a6df0eb185a9;hb=b67a3505b58ffd204ee1a2560be3026688be8f10;hp=27c8d23b61710d4478c3a96008c52176bceeec66;hpb=0165a71f3074233f03c868cce9b760e51cc10ff5;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 27c8d23b6..5cbe884ec 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -186,7 +186,7 @@ FilmViewer::get (DCPTime p, bool accurate) if (!pvf.empty ()) { try { - _frame = pvf.front()->image (PIX_FMT_RGB24, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2)); + _frame = pvf.front()->image (AV_PIX_FMT_RGB24, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2)); ImageChanged (pvf.front ()); dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601; @@ -194,7 +194,7 @@ FilmViewer::get (DCPTime p, bool accurate) yuv_to_rgb = pvf.front()->colour_conversion().get().yuv_to_rgb(); } - _frame = _frame->scale (_frame->size(), yuv_to_rgb, PIX_FMT_RGB24, false); + _frame = _frame->scale (_frame->size(), yuv_to_rgb, AV_PIX_FMT_RGB24, false); _position = pvf.front()->time (); _inter_position = pvf.front()->inter_position (); _inter_size = pvf.front()->inter_size ();