Commit 2210b540 authored by Philippe Gorley's avatar Philippe Gorley

build: fix uwp and ios builds

Broken by f6d001e3 (video: use ffmpeg' AVPixelFormat).

Change-Id: I23f103701b3a9a2e30e7648cb5862ac6ae59ad3b
parent 1179ad57
......@@ -22,6 +22,10 @@
#include <array>
extern "C" {
#include <libavutil/pixfmt.h>
}
#include "logger.h"
#include "../video_device.h"
......@@ -32,7 +36,7 @@ namespace ring { namespace video {
typedef struct
{
std::string name;
enum VideoPixelFormat ring_format;
enum AVPixelFormat pixfmt;
} ios_fmt;
static const std::array<ios_fmt, 4> ios_formats
......@@ -151,7 +155,7 @@ VideoDeviceImpl::getDeviceParams() const
DeviceParams params;
std::stringstream ss1, ss2;
ss1 << fmt_->ring_format;
ss1 << fmt_->pixfmt;
ss1 >> params.format;
params.name = name;
......
......@@ -21,6 +21,10 @@
#include <array>
extern "C" {
#include <libavutil/pixfmt.h>
}
#include "logger.h"
#include "../video_device.h"
......@@ -33,7 +37,7 @@ namespace ring { namespace video {
typedef struct
{
std::string name;
enum VideoPixelFormat ring_format;
enum AVPixelFormat pixfmt;
} uwp_fmt;
// have all formats map to bgra
......@@ -154,7 +158,7 @@ VideoDeviceImpl::getDeviceParams() const
DeviceParams params;
std::stringstream ss1, ss2;
ss1 << fmt_->ring_format;
ss1 << fmt_->pixfmt;
ss1 >> params.format;
params.name = name;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment