update libaom via Andrew + 0006 patch LIBZMPEG

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / file.C

diff --git a/cinelerra-5.1/cinelerra/file.C b/cinelerra-5.1/cinelerra/file.C
index 88e36f63147e76c292c558841a838956f88fb8da..dbcd68899a5e150fe5e79d256fe0276fbefeb1f6 100644 (file)
--- a/cinelerra-5.1/cinelerra/file.C
+++ b/cinelerra-5.1/cinelerra/file.C
@@ -174,10 +174,12 @@ int File::get_options(FormatTools *format,
        format_completion->lock("File::get_options");
        switch( asset->format ) {
 #ifdef HAVE_CIN_3RDPARTY
+#ifdef HAVE_LIBZMPEG
        case FILE_AC3: FileAC3::get_parameters(parent_window, asset, format_window,
                        audio_options, video_options, edl);
                break;
 #endif
+#endif
 #ifdef HAVE_DV
        case FILE_RAWDV:
                FileDV::get_parameters(parent_window, asset, format_window,
@@ -543,9 +545,11 @@ int File::open_file(Preferences *preferences,
                break; }
 // format already determined
 #ifdef HAVE_CIN_3RDPARTY
+#ifdef HAVE_LIBZMPEG
        case FILE_AC3:
                file = new FileAC3(this->asset, this);
                break;
+#endif
 #endif
        case FILE_SCENE:
                file = new FileScene(this->asset, this);