diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-06-05 21:09:55 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-06-06 23:10:58 +0200 |
| commit | f7b6c0595fe13be3f4a10bcce88dd895b1111b57 (patch) | |
| tree | eacad37f58b04c70d0f775ff9a989524be721e1d | |
| parent | 59953282b9f9da1164f39181347a01672c4f674c (diff) | |
Remove unused H246_PCM export code.
| -rw-r--r-- | src/lib/ffmpeg_file_encoder.cc | 7 | ||||
| -rw-r--r-- | src/lib/types.h | 1 | ||||
| -rw-r--r-- | test/ffmpeg_encoder_test.cc | 1 |
3 files changed, 0 insertions, 9 deletions
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); } |