From: Carl Hetherington <cth@carlh.net>
Date: Sun, 5 Jun 2022 19:09:55 +0000 (+0200)
Subject: Remove unused H246_PCM export code.
X-Git-Tag: v2.16.14~38
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=f7b6c0595fe13be3f4a10bcce88dd895b1111b57

Remove unused H246_PCM export code.
---

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index 9189c3e83..d645c4c6b 100644
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -241,12 +241,6 @@ FFmpegFileEncoder::FFmpegFileEncoder (
 		_audio_codec_name = "aac";
 		av_dict_set_int (&_video_options, "crf", x264_crf, 0);
 		break;
-	case ExportFormat::H264_PCM:
-		_sample_format = AV_SAMPLE_FMT_S32;
-		_video_codec_name = "libx264";
-		_audio_codec_name = "pcm_s24le";
-		av_dict_set_int (&_video_options, "crf", x264_crf, 0);
-		break;
 	default:
 		DCPOMATIC_ASSERT (false);
 	}
@@ -290,7 +284,6 @@ FFmpegFileEncoder::pixel_format (ExportFormat format)
 	case ExportFormat::PRORES:
 		return AV_PIX_FMT_YUV422P10;
 	case ExportFormat::H264_AAC:
-	case ExportFormat::H264_PCM:
 		return AV_PIX_FMT_YUV420P;
 	default:
 		DCPOMATIC_ASSERT (false);
diff --git a/src/lib/types.h b/src/lib/types.h
index 6fbad2188..9b322bdae 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -171,7 +171,6 @@ enum class ExportFormat
 {
 	PRORES,
 	H264_AAC,
-	H264_PCM,
 	SUBTITLES_DCP
 };
 
diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index 9edf2bdbd..097ef86e7 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -61,7 +61,6 @@ ffmpeg_content_test (int number, boost::filesystem::path content, ExportFormat f
 		name += "prores";
 		extension = "mov";
 		break;
-	case ExportFormat::H264_PCM:
 	case ExportFormat::SUBTITLES_DCP:
 		BOOST_REQUIRE (false);
 	}