GithubStar/QtAV
1
0
Fork 0
mirror of https://github.com/wang-bin/QtAV.git synced 2026-10-17 04:31:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when unable to decode subtitles

Browse Source 
In case of some videos avcodec_descriptor_get() returns a nullptr, which later causes a crash when trying to access its name.
This commit is contained in:
mwochal
2021-10-25 23:41:09 +02:00
committed by Maciej Wochal
parent 305e54041f
commit 241b1cdf7f
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AVPlayerPrivate.cpp
+7 -1
View File
@@ -472,7 +472,11 @@ QVariantList AVPlayer::Private::getTracksInfo(AVDemuxer *demuxer, AVDemuxer::Str
AVStream *stream = demuxer->formatContext()->streams[s];
AVCodecContext *ctx = stream->codec;
if (ctx) {
t[QStringLiteral("codec")] = QByteArray(avcodec_descriptor_get(ctx->codec_id)->name);
const AVCodecDescriptor* codec_desc = avcodec_descriptor_get(ctx->codec_id);
if (codec_desc)
t[QStringLiteral("codec")] = QByteArray(codec_desc->name);
else
continue;
if (ctx->extradata)
t[QStringLiteral("extra")] = QByteArray((const char*)ctx->extradata, ctx->extradata_size);
}
@@ -503,6 +507,8 @@ bool AVPlayer::Private::applySubtitleStream(int n, AVPlayer *player)
return false;
// FIXME: AVCodecDescriptor.name and AVCodec.name are different!
const AVCodecDescriptor *codec_desc = avcodec_descriptor_get(ctx->codec_id);
if (!codec_desc)
return false;
QByteArray codec(codec_desc->name);
if (ctx->extradata)
Q_EMIT player->internalSubtitleHeaderRead(codec, QByteArray((const char*)ctx->extradata, ctx->extradata_size));