diff options
| author | aneejit1 <aneejit1@gmail.com> | 2022-05-04 04:42:23 +0000 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2022-05-06 08:58:41 +0200 |
| commit | 376a0f6bdc66a66c44dc8e708ad97a8cd2ef4437 (patch) | |
| tree | c731cf7a47c2049fc272dc1a93794c1e607fe6fb | |
| parent | aa3cdfd2c3b26b96df2a39a77b91f6deb6cee05f (diff) | |
| download | k3b-376a0f6b.tar.gz k3b-376a0f6b.zip | |
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 1f4a3ab86ef18f5c8416ed1f7da72f82476529a2)
| -rw-r--r-- | libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp index 06f6e30..15151ac 100644 --- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp +++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp @@ -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 ) |