Cleanup: whitespace.

[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 fe39c6b2efa8282f787855db12ea92742e4b23d6..5a25b8cd90070feec5c3303c779644155bd14083 100644 (file)
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -229,16 +229,16 @@ FFmpegFileEncoder::FFmpegFileEncoder (
 
        switch (format) {
        case ExportFormat::PRORES_4444:
-               _sample_format = AV_SAMPLE_FMT_S16;
+               _sample_format = AV_SAMPLE_FMT_S32;
                _video_codec_name = "prores_ks";
-               _audio_codec_name = "pcm_s16le";
+               _audio_codec_name = "pcm_s24le";
                av_dict_set(&_video_options, "profile", "4", 0);
                av_dict_set(&_video_options, "threads", "auto", 0);
                break;
        case ExportFormat::PRORES_HQ:
-               _sample_format = AV_SAMPLE_FMT_S16;
+               _sample_format = AV_SAMPLE_FMT_S32;
                _video_codec_name = "prores_ks";
-               _audio_codec_name = "pcm_s16le";
+               _audio_codec_name = "pcm_s24le";
                av_dict_set (&_video_options, "profile", "3", 0);
                av_dict_set (&_video_options, "threads", "auto", 0);
                break;
@@ -325,7 +325,7 @@ FFmpegFileEncoder::setup_video ()
        _video_codec_context->flags |= AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_GLOBAL_HEADER;
 
        if (avcodec_open2 (_video_codec_context, _video_codec, &_video_options) < 0) {
-               throw EncodeError (N_("avcodec_open"), N_("FFmpegFileEncoder::setup_video"));
+               throw EncodeError(N_("avcodec_open2"), N_("FFmpegFileEncoder::setup_video"));
        }
 
        _video_stream = avformat_new_stream (_format_context, _video_codec);