Cool_Tools/vichan
1
0
Fork 0
mirror of https://github.com/vichan-devel/vichan.git synced 2025-02-16 02:52:40 +01:00
Code Releases Wiki Activity

Merge pull request #893 from perdedora/mp4-noaudio-887

Browse Source 
Faulty logic in ffmpeg.php
This commit is contained in:
Lorenzo Yario 2025-02-12 18:11:48 -06:00 committed by GitHub
commit 41b497bbb2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
inc/lib/webm/ffmpeg.php
View File

@ -28,8 +28,17 @@ function is_valid_webm($ffprobe_out) {
if ($ffprobe_out['format']['format_name'] != 'matroska,webm')
return array('code' => 2, 'msg' => $config['error']['invalidwebm']);
} elseif ($extension === 'mp4') {
if ($ffprobe_out['streams'][0]['codec_name'] != 'h264' && $ffprobe_out['streams'][1]['codec_name'] != 'aac')
if (!isset($ffprobe_out['streams'][0]['codec_name'])) {
return array('code' => 2, 'msg' => $config['error']['invalidwebm']);
}
$video_codec = $ffprobe_out['streams'][0]['codec_name'];
$audio_codec = $ffprobe_out['streams'][1]['codec_name'] ?? null;
if ($video_codec !== 'h264' || ($audio_codec && $audio_codec !== 'aac')) {
return array('code' => 2, 'msg' => $config['error']['invalidwebm']);
}
} else {
return array('code' => 1, 'msg' => $config['error']['genwebmerror']);
}