diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-12 17:12:49 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-12 17:12:49 +0100 |
| commit | ad6c0bbec4f354f29fb968099ff1a0ce2e57c43a (patch) | |
| tree | e5928a8f22bf9a3c2a18927b88dc8c3d382f64be /src/lib/ffmpeg_decoder.cc | |
| parent | 0eee0c3adda726542a5f2b8fad68f54ebf701392 (diff) | |
Remove unused RGBPlusAlphaImage; merge Image/SimpleImage.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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<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]; |