X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_encoder.cc;h=f82290c6cd2f1183edb71063fd18337940ebddce;hb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;hp=7e51ba19f7d396b9aa2f2ac8843eef329d4974e4;hpb=dcacf91a98cefe4776757708ab65152acd65ba94;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 7e51ba19f..f82290c6c 100644
--- 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_captions ();
 	_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
@@ -411,7 +411,7 @@ FFmpegEncoder::audio_frame (int size)
 }
 
 void
-FFmpegEncoder::subtitle (PlayerSubtitles, DCPTimePeriod)
+FFmpegEncoder::subtitle (PlayerText, DCPTimePeriod)
 {
 
 }