diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-20 13:23:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-20 13:23:26 +0100 |
| commit | 39bc73fe192f932ed6695eb87b19de446e8b4f55 (patch) | |
| tree | 4811b0642b7fcd73206b037da4ffb342e90ce6dc /src/lib/image_decoder.h | |
| parent | bb0a36c3a6bea9cd1ebdde7b8a3a04765e317569 (diff) | |
| parent | 884093edac5f63d26c02d411c73dfb52376ccf8f (diff) | |
Merge master.
Diffstat (limited to 'src/lib/image_decoder.h')
| -rw-r--r-- | src/lib/image_decoder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h index 8d88df3de..242f69477 100644 --- a/src/lib/image_decoder.h +++ b/src/lib/image_decoder.h @@ -40,7 +40,7 @@ private: bool pass (); boost::shared_ptr<const ImageContent> _image_content; - boost::shared_ptr<Image> _image; + boost::shared_ptr<ImageProxy> _image; VideoFrame _video_position; }; |