projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build with the macOS 10.8 version of wxWidgets.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_file_encoder.cc
diff --git
a/src/lib/ffmpeg_file_encoder.cc
b/src/lib/ffmpeg_file_encoder.cc
index f253c73a0d9b69d6c7d29f41dbf87eb8e3aa8a10..705557f799b3b76f434eb182fe116b4a32b03e85 100644
(file)
--- a/
src/lib/ffmpeg_file_encoder.cc
+++ b/
src/lib/ffmpeg_file_encoder.cc
@@
-19,16
+19,19
@@
*/
*/
+#include "compose.hpp"
+#include "cross.h"
#include "ffmpeg_encoder.h"
#include "ffmpeg_wrapper.h"
#include "film.h"
#include "ffmpeg_encoder.h"
#include "ffmpeg_wrapper.h"
#include "film.h"
+#include "image.h"
#include "job.h"
#include "job.h"
+#include "log.h"
#include "player.h"
#include "player_video.h"
#include "player.h"
#include "player_video.h"
-#include "log.h"
-#include "image.h"
-#include "cross.h"
-#include "compose.hpp"
+extern "C" {
+#include <libavutil/channel_layout.h>
+}
#include <iostream>
#include "i18n.h"
#include <iostream>
#include "i18n.h"
@@
-36,13
+39,9
@@
using std::cout;
using std::make_shared;
using std::cout;
using std::make_shared;
-using std::pair;
-using std::runtime_error;
using std::shared_ptr;
using std::string;
using std::shared_ptr;
using std::string;
-using std::weak_ptr;
using boost::bind;
using boost::bind;
-using boost::optional;
using namespace dcpomatic;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
using namespace dcpomatic;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
@@
-203,7
+202,7
@@
public:
private:
AVFormatContext* _format_context;
private:
AVFormatContext* _format_context;
- AVCodec* _codec;
+ AVCodec
const
* _codec;
AVCodecContext* _codec_context;
AVStream* _stream;
int _stream_index;
AVCodecContext* _codec_context;
AVStream* _stream;
int _stream_index;
@@
-403,7
+402,6
@@
FFmpegFileEncoder::video (shared_ptr<PlayerVideo> video, DCPTime time)
auto image = video->image (
bind (&PlayerVideo::force, _1, _pixel_format),
VideoRange::VIDEO,
auto image = video->image (
bind (&PlayerVideo::force, _1, _pixel_format),
VideoRange::VIDEO,
- true,
false
);
false
);