X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fformatcheck.C;h=85914c46e634adcb01ad2ba27efe87190d219e65;hb=72a6abf751403bd91464e77ff2cece01c9756a6b;hp=d3469623093352317fb18ac76f49e15d0dae2131;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/formatcheck.C b/cinelerra-5.1/cinelerra/formatcheck.C index d3469623..85914c46 100644 --- a/cinelerra-5.1/cinelerra/formatcheck.C +++ b/cinelerra-5.1/cinelerra/formatcheck.C @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ #include "asset.h" @@ -54,7 +54,7 @@ int FormatCheck::check_format() result = 1; } } - + if(!result && asset->audio_data) { if(!File::supports_audio(asset->format)) @@ -65,11 +65,11 @@ int FormatCheck::check_format() result = 1; } - if(!result && asset->bits == BITSULAW && + if(!result && asset->bits == BITSULAW && asset->format != FILE_PCM) { ErrorBox errorbox(_(PROGRAM_NAME ": Error")); - errorbox.create_objects(_("ULAW compression is only available in\n" + errorbox.create_objects(_("ULAW compression is only available in\n" "Quicktime Movies and PCM files.")); errorbox.run_window(); result = 1;