Remove unused H246_PCM export code.

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index 9189c3e8347d8403d077a27448d0178c4543a7be..d645c4c6b854eb56df0b3bb2ef01b3afaa7b5186 100644 (file)
--- 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;
                _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);
        }
        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::PRORES:
                return AV_PIX_FMT_YUV422P10;
        case ExportFormat::H264_AAC:

-       case ExportFormat::H264_PCM:

                return AV_PIX_FMT_YUV420P;
        default:
                DCPOMATIC_ASSERT (false);
                return AV_PIX_FMT_YUV420P;
        default:
                DCPOMATIC_ASSERT (false);

diff --git a/src/lib/types.h b/src/lib/types.h
index 6fbad21883084da078dcc7ed09d7c78d51921922..9b322bdaeea5da81ebec291135b1a12b10db9962 100644 (file)
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -171,7 +171,6 @@ enum class ExportFormat
 {
        PRORES,
        H264_AAC,
 {
        PRORES,
        H264_AAC,

-       H264_PCM,

        SUBTITLES_DCP
 };
 
        SUBTITLES_DCP
 };
 

diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index 9edf2bdbd5880748b64155e13e79e07eed1b6d2d..097ef86e720f9f9762efe03834ba1885a2bc6a9b 100644 (file)
--- 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;
                name += "prores";
                extension = "mov";
                break;

-       case ExportFormat::H264_PCM:

        case ExportFormat::SUBTITLES_DCP:
                BOOST_REQUIRE (false);
        }
        case ExportFormat::SUBTITLES_DCP:
                BOOST_REQUIRE (false);
        }