From ad6c0bbec4f354f29fb968099ff1a0ce2e57c43a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 12 Jul 2013 17:12:49 +0100 Subject: Remove unused RGBPlusAlphaImage; merge Image/SimpleImage. --- src/lib/ffmpeg_decoder.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/ffmpeg_decoder.cc') diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index fddb70294..27009114c 100644 --- 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 black ( - new SimpleImage ( + new Image ( static_cast (_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 (new SimpleImage (PIX_FMT_RGBA, libdcp::Size (rect->w, rect->h), true)); + shared_ptr 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]; -- cgit v1.2.3