projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use dcp::file_to_string().
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_encoder.h
diff --git
a/src/lib/ffmpeg_encoder.h
b/src/lib/ffmpeg_encoder.h
index c71f8fa63348a0cabda4480f79db1c1d044836d8..710364b013840779d0fb80fdd204ca7d57960e75 100644
(file)
--- a/
src/lib/ffmpeg_encoder.h
+++ b/
src/lib/ffmpeg_encoder.h
@@
-32,8
+32,8
@@
class FFmpegEncoder : public Encoder
{
public:
FFmpegEncoder (
{
public:
FFmpegEncoder (
-
boost
::shared_ptr<const Film> film,
-
boost
::weak_ptr<Job> job,
+
std
::shared_ptr<const Film> film,
+
std
::weak_ptr<Job> job,
boost::filesystem::path output,
ExportFormat format,
bool mixdown_to_stereo,
boost::filesystem::path output,
ExportFormat format,
bool mixdown_to_stereo,
@@
-68,12
+68,12
@@
private:
std::string extension
);
std::string extension
);
-
boost
::shared_ptr<FFmpegFileEncoder> get (Eyes eyes) const;
+
std
::shared_ptr<FFmpegFileEncoder> get (Eyes eyes) const;
void flush ();
void flush ();
- void audio (
boost
::shared_ptr<AudioBuffers>);
+ void audio (
std
::shared_ptr<AudioBuffers>);
private:
private:
- std::map<Eyes,
boost
::shared_ptr<FFmpegFileEncoder> > _encoders;
+ std::map<Eyes,
std
::shared_ptr<FFmpegFileEncoder> > _encoders;
};
int _output_audio_channels;
};
int _output_audio_channels;
@@
-89,7
+89,7
@@
private:
bool _audio_stream_per_channel;
int _x264_crf;
bool _audio_stream_per_channel;
int _x264_crf;
-
boost
::shared_ptr<Butler> _butler;
+
std
::shared_ptr<Butler> _butler;
};
#endif
};
#endif