Make s_codecFeatures a "const char *" to remove ISO C++ warning

"libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp" declares two instances
of "s_codecFeatures" as "static char *" and initialises them with
string constants. This produces the compiler warning "ISO C++ forbids
converting a string constant to 'char*'". Both declarations have been
changed to "const".

Signed-off-by: aneejit1 <aneejit1@gmail.com>
(cherry picked from commit 1f4a3ab86e)
r14.0.x
aneejit1 3 years ago committed by Slávek Banko
parent aa3cdfd2c3
commit 376a0f6bdc
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -561,7 +561,7 @@ TQString K3bVideoDVDTitleTranscodingJob::audioCodecDescription( K3bVideoDVDTitle
bool K3bVideoDVDTitleTranscodingJob::transcodeBinaryHasSupportFor( K3bVideoDVDTitleTranscodingJob::VideoCodec codec, const K3bExternalBin* bin )
{
static char* s_codecFeatures[] = { "xvid", "ffmpeg" };
static const char* s_codecFeatures[] = { "xvid", "ffmpeg" };
if( !bin )
bin = k3bcore->externalBinManager()->binObject("transcode");
if( !bin )
@ -572,7 +572,7 @@ bool K3bVideoDVDTitleTranscodingJob::transcodeBinaryHasSupportFor( K3bVideoDVDTi
bool K3bVideoDVDTitleTranscodingJob::transcodeBinaryHasSupportFor( K3bVideoDVDTitleTranscodingJob::AudioCodec codec, const K3bExternalBin* bin )
{
static char* s_codecFeatures[] = { "lame", "ac3", "ac3" };
static const char* s_codecFeatures[] = { "lame", "ac3", "ac3" };
if( !bin )
bin = k3bcore->externalBinManager()->binObject("transcode");
if( !bin )

Loading…
Cancel
Save