videoplayer: ColorModel got renamed to ColourModel

diff --git a/videoplayer/src/videodec.rs b/videoplayer/src/videodec.rs
index e6c0e1512e7a9f5fc5e0c2c28f5a43c6e8d60650..a7dd5ef9ed25e0c1c4f986510cbcd31ed506f2e9 100644 (file)
--- a/videoplayer/src/videodec.rs
+++ b/videoplayer/src/videodec.rs
@@ -21,7 +21,7 @@ static VDEC_STATE: DecoderState = DecoderState::new();
 
 pub const FRAME_QUEUE_SIZE: usize = 25;
 
-pub const SDL_RGB_FMT: NAPixelFormaton = NAPixelFormaton { model: ColorModel::RGB(RGBSubmodel::RGB), components: 3,
+pub const SDL_RGB_FMT: NAPixelFormaton = NAPixelFormaton { model: ColourModel::RGB(RGBSubmodel::RGB), components: 3,
     comp_info: [
         Some(NAPixelChromaton { h_ss: 0, v_ss: 0, packed: true, depth: 8, shift: 0, comp_offs: 0, next_elem: 3 }),
         Some(NAPixelChromaton { h_ss: 0, v_ss: 0, packed: true, depth: 8, shift: 0, comp_offs: 1, next_elem: 3 }),
@@ -76,7 +76,7 @@ impl VideoDecoder {
             let ofmt = if do_yuv { self.ofmt_yuv } else { self.ofmt_rgb };
             self.scaler = NAScale::new_with_options(sc_ifmt, ofmt, &sc_opts).expect("scaling should not fail");
         }
-        let mut opic = if let ColorModel::YUV(_) = self.ifmt.get_format().get_model() {
+        let mut opic = if let ColourModel::YUV(_) = self.ifmt.get_format().get_model() {
                 self.yuv_pool.prealloc_video(self.oinfo_yuv, 2).expect("video frame pool allocation failure");
                 while self.yuv_pool.get_free().is_none() {
                     if VDEC_STATE.is_flushing() {