diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-21 19:14:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-21 19:14:58 +0100 |
| commit | cb990adba9c57e5107ef2aa9716cf0a26c1df83d (patch) | |
| tree | e59571d05db47b6f1070c85331ba351fd2794adf /src/lib/player_video.h | |
| parent | 8a19e2b56d3b95a18ae8ac9965eab750c28d30ad (diff) | |
| parent | 5c8599593ee8b3ef05d5c55c5f0885a2d8bfb9d2 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/player_video.h')
| -rw-r--r-- | src/lib/player_video.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/player_video.h b/src/lib/player_video.h index 0f5e83b10..e9d260972 100644 --- a/src/lib/player_video.h +++ b/src/lib/player_video.h @@ -18,6 +18,9 @@ */ #include <boost/shared_ptr.hpp> +extern "C" { +#include <libavutil/pixfmt.h> +} #include "types.h" #include "position.h" #include "colour_conversion.h" @@ -54,7 +57,7 @@ public: void set_subtitle (PositionImage); - boost::shared_ptr<Image> image (bool burn_subtitle) const; + boost::shared_ptr<Image> image (AVPixelFormat pix_fmt, bool burn_subtitle) const; void add_metadata (xmlpp::Node* node, bool send_subtitles) const; void send_binary (boost::shared_ptr<Socket> socket, bool send_subtitles) const; |