mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

streaminfo2: fix segfault with unknown media_type

Browse Source 
Origin commit data
------------------
Commit: c60990407b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2020-02-17 (Mon, 17 Feb 2020)
This commit is contained in:
Jacek Jendrzej
2020-02-17 17:05:06 +01:00
committed by vanhofen
parent aba000ae3b
commit 3c39d2af9a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/streaminfo2.cpp
View File

@@ -183,11 +183,13 @@ void CStreamInfo2::analyzeStream(AVFormatContext *avfc, unsigned int idx)
size_t pos = m["codec"].find_first_of(":"); size_t pos = m["codec"].find_first_of(":");
if (pos != std::string::npos) if (pos != std::string::npos)
m["codec"] = m["codec"].erase(0, pos + 2); m["codec"] = m["codec"].erase(0, pos + 2);
#if (LIBAVFORMAT_VERSION_MAJOR > 57) || ((LIBAVFORMAT_VERSION_MAJOR == 57) && (LIBAVFORMAT_VERSION_MINOR > 32)) #if (LIBAVFORMAT_VERSION_MAJOR > 57) || ((LIBAVFORMAT_VERSION_MAJOR == 57) && (LIBAVFORMAT_VERSION_MINOR > 32))
m["codec_type"] = av_get_media_type_string(st->codecpar->codec_type); std::string codecType = av_get_media_type_string(st->codecpar->codec_type) ? av_get_media_type_string(st->codecpar->codec_type):"unknown";
#else #else
m["codec_type"] = av_get_media_type_string(st->codec->codec_type); std::string codecType = av_get_media_type_string(st->codec->codec_type) ? av_get_media_type_string(st->codec->codec_type):"unknown";
#endif #endif
m["codec_type"] = codecType;
m["codec_type"][0] ^= 'a' ^ 'A'; m["codec_type"][0] ^= 'a' ^ 'A';
m["pid"] = to_string(st->id); m["pid"] = to_string(st->id);