games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Merge pull request #5337 from IvanSavenko/ffmpeg_explicit

Browse Source 
[1.6?] Explicit toggle for ffmpeg video player compilation
This commit is contained in:
Ivan Savenko
2025-01-29 12:01:35 +02:00
committed by GitHub
parent 37b981e4a0 bc524c60d7
commit 8d78bb1a82
7 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/media/CVideoHandler.cpp
View File

@@ -10,7 +10,7 @@
#include "StdInc.h"
#include "CVideoHandler.h"
#ifndef DISABLE_VIDEO
#ifdef ENABLE_VIDEO
#include "ISoundPlayer.h"
@@ -671,6 +671,8 @@ std::pair<std::unique_ptr<ui8 []>, si64> CAudioInstance::extractAudio(const Vide
std::unique_ptr<IVideoInstance> CVideoPlayer::open(const VideoPath & name, float scaleFactor)
{
logGlobal->trace("Opening video: %s", name.getOriginalName());
auto result = std::make_unique<CVideoInstance>();
if (!result->openInput(name))
@@ -687,6 +689,8 @@ std::unique_ptr<IVideoInstance> CVideoPlayer::open(const VideoPath & name, float
std::pair<std::unique_ptr<ui8[]>, si64> CVideoPlayer::getAudio(const VideoPath & videoToOpen)
{
logGlobal->trace("Opening video: %s", videoToOpen.getOriginalName());
AudioPath audioPath = videoToOpen.toType<EResType::SOUND>();
AudioPath audioPathVideoDir = audioPath.addPrefix("VIDEO/");