Merge pull request !313 from yj/master
This commit is contained in:
openharmony_ci 2024-10-29 02:49:29 +00:00 committed by Gitee
commit 2b17b57c55
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 4 additions and 1 deletions

View File

@ -402,6 +402,9 @@ static void read_ttag(AVFormatContext *s, AVIOContext *pb, int taglen,
if (encoding == ID3v2_ENCODING_ISO8859) {
const int utf8len = 256;
char *utf8 = av_malloc(utf8len + 1);
if (utf8 == NULL) {
return;
}
utf8[utf8len] = '\0';
int resultLen = iso8859_convert_utf8(dst, strlen(dst), utf8, utf8len);
if (resultLen >= 0) {

View File

@ -2491,7 +2491,7 @@ static int mov_read_cdsc(MOVContext *c, AVIOContext *pb, MOVAtom atom)
if (c->fc->nb_streams < 1)
return 0;
st = c->fc->streams[c->fc->nb_streams - 1];
unsigned int src_track_id = avio_rb32(pb);
int src_track_id = (int)avio_rb32(pb);
char* metaKeyStr;
metaKeyStr = av_d2str(src_track_id - 1);
if (!metaKeyStr)