summaryrefslogtreecommitdiff
path: root/src/lib/player_video.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-10 14:04:10 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-10 14:04:10 +0100
commit5c0a67869dbddb924c9f5ccb4126aa06d85b9b8b (patch)
treec923ed014e373f5ad84cfe82f3736bcba6b7eabf /src/lib/player_video.h
parent717ad0a42f8f3b744ad3bffcb094518ad59ef7b3 (diff)
Rename EncodedData -> Data and trim it a bit.
Diffstat (limited to 'src/lib/player_video.h')
-rw-r--r--src/lib/player_video.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index c4537f713..3abca8267 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -29,7 +29,7 @@ extern "C" {
class Image;
class ImageProxy;
class Socket;
-class EncodedData;
+class Data;
/** Everything needed to describe a video frame coming out of the player, but with the
* bits still their raw form. We may want to combine the bits on a remote machine,
@@ -60,7 +60,7 @@ public:
void send_binary (boost::shared_ptr<Socket> socket, bool send_subtitles) const;
bool has_j2k () const;
- boost::shared_ptr<EncodedData> j2k () const;
+ boost::shared_ptr<Data> j2k () const;
DCPTime time () const {
return _time;