etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-11-15 08:15:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

ffmpeg/tools: Fix compatibility with Ubuntu 18.04

Browse source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-08-10 03:25:36 +02:00 committed by Michael Fabian Dirks
parent a53518cdb9
commit b4a727cb86
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/ffmpeg/tools.cpp
View file

@ -21,9 +21,7 @@
#include "tools.hpp" #include "tools.hpp"
#include <list> #include <list>
#include <map>
#include <sstream> #include <sstream>
#include <stdexcept>
#include "plugin.hpp" #include "plugin.hpp"
extern "C" { extern "C" {
@ -172,7 +170,7 @@ bool tools::can_hardware_encode(const AVCodec* codec)
std::vector<AVPixelFormat> tools::get_software_formats(const AVPixelFormat* list) std::vector<AVPixelFormat> tools::get_software_formats(const AVPixelFormat* list)
{ {
AVPixelFormat hardware_formats[] = { constexpr AVPixelFormat hardware_formats[] = {
#if FF_API_VAAPI #if FF_API_VAAPI
AV_PIX_FMT_VAAPI_MOCO, AV_PIX_FMT_VAAPI_MOCO,
AV_PIX_FMT_VAAPI_IDCT, AV_PIX_FMT_VAAPI_IDCT,
@ -188,7 +186,6 @@ std::vector<AVPixelFormat> tools::get_software_formats(const AVPixelFormat* list
AV_PIX_FMT_VIDEOTOOLBOX, AV_PIX_FMT_VIDEOTOOLBOX,
AV_PIX_FMT_MEDIACODEC, AV_PIX_FMT_MEDIACODEC,
AV_PIX_FMT_D3D11, AV_PIX_FMT_D3D11,
AV_PIX_FMT_OPENCL,
}; };
std::vector<AVPixelFormat> fmts; std::vector<AVPixelFormat> fmts;

2
source/ffmpeg/tools.hpp
View file

@ -22,8 +22,6 @@
#pragma once #pragma once
#include "common.hpp" #include "common.hpp"
#include <functional> #include <functional>
#include <string>
#include <vector>
extern "C" { extern "C" {
#ifdef _MSC_VER #ifdef _MSC_VER