Remove unused RGBPlusAlphaImage; merge Image/SimpleImage.

[dcpomatic.git] / src / lib / ffmpeg_decoder.cc

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index fddb7029484c23695b6be457c5843d0813754fd1..27009114c3e34492046ae4ec497018fd3287c9a3 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -412,7 +412,7 @@ FFmpegDecoder::decode_video_packet ()
                                   a black frame.
                                */
                                boost::shared_ptr<Image> black (
-                                       new SimpleImage (
+                                       new Image (
                                                static_cast<AVPixelFormat> (_frame->format),
                                                libdcp::Size (video_codec_context()->width, video_codec_context()->height),
                                                true
@@ -503,7 +503,7 @@ FFmpegDecoder::decode_subtitle_packet ()
                throw DecodeError (_("non-bitmap subtitles not yet supported"));
        }
        
-       shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGBA, libdcp::Size (rect->w, rect->h), true));
+       shared_ptr<Image> image (new Image (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];