Tidy up after mass rename.

[dcpomatic.git] / src / lib / ffmpeg_encoder.cc

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 6b41cfbe07f5dbdf95b682eb088492dd9e6573df..71063c12371d3c4765e42c5120089bca1b051af7 100644 (file)
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -72,7 +72,7 @@ FFmpegEncoder::FFmpegEncoder (shared_ptr<const Film> film, weak_ptr<Job> job, bo
                break;
        }
 
-       _player->set_always_burn_subtitles (true);
+       _player->set_always_burn_open_subtitles ();
        _player->set_play_referenced ();
 
        int const ch = film->audio_channels ();
@@ -123,7 +123,7 @@ FFmpegEncoder::setup_video ()
        _video_codec_context->height = _film->frame_size().height;
        _video_codec_context->time_base = (AVRational) { 1, _film->video_frame_rate() };
        _video_codec_context->pix_fmt = _pixel_format;
-       _video_codec_context->flags |= CODEC_FLAG_QSCALE | CODEC_FLAG_GLOBAL_HEADER;
+       _video_codec_context->flags |= AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_GLOBAL_HEADER;
 }
 
 void
@@ -216,7 +216,7 @@ FFmpegEncoder::go ()
                                deinterleaved->data(k)[j] = *p++;
                        }
                }
-               audio (deinterleaved, i);
+               audio (deinterleaved);
        }
        delete[] interleaved;
 
@@ -327,14 +327,14 @@ FFmpegEncoder::video (shared_ptr<PlayerVideo> video, DCPTime time)
 
 /** Called when the player gives us some audio */
 void
-FFmpegEncoder::audio (shared_ptr<AudioBuffers> audio, DCPTime)
+FFmpegEncoder::audio (shared_ptr<AudioBuffers> audio)
 {
        _pending_audio->append (audio);
 
        int frame_size = _audio_codec_context->frame_size;
        if (frame_size == 0) {
                /* codec has AV_CODEC_CAP_VARIABLE_FRAME_SIZE */
-               frame_size = 2000;
+               frame_size = _film->audio_frame_rate() / _film->video_frame_rate();
        }
 
        while (_pending_audio->frames() >= frame_size) {
@@ -411,7 +411,7 @@ FFmpegEncoder::audio_frame (int size)
 }
 
 void
-FFmpegEncoder::subtitle (PlayerSubtitles, DCPTimePeriod)
+FFmpegEncoder::subtitle (PlayerText, DCPTimePeriod)
 {
 
 }