projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy and fix logging.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_file_encoder.h
diff --git
a/src/lib/ffmpeg_file_encoder.h
b/src/lib/ffmpeg_file_encoder.h
index 803125bd3cf677f487a0fd70f9134083fea6e0db..8b9d0b67c2a7269af994690ca52ede24a6880bc2 100644
(file)
--- a/
src/lib/ffmpeg_file_encoder.h
+++ b/
src/lib/ffmpeg_file_encoder.h
@@
-38,7
+38,6
@@
public:
int video_frame_rate,
int audio_frame_rate,
int channels,
int video_frame_rate,
int audio_frame_rate,
int channels,
- boost::shared_ptr<Log> log,
ExportFormat,
int x264_crf,
boost::filesystem::path output
ExportFormat,
int x264_crf,
boost::filesystem::path output
@@
-50,6
+49,8
@@
public:
void flush ();
void flush ();
+ static AVPixelFormat pixel_format (ExportFormat format);
+
private:
void setup_video ();
void setup_audio ();
private:
void setup_video ();
void setup_audio ();
@@
-77,7
+78,6
@@
private:
dcp::Size _video_frame_size;
int _video_frame_rate;
int _audio_frame_rate;
dcp::Size _video_frame_size;
int _video_frame_rate;
int _audio_frame_rate;
- boost::shared_ptr<Log> _log;
boost::shared_ptr<AudioBuffers> _pending_audio;
boost::shared_ptr<AudioBuffers> _pending_audio;