ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix build with g++, grumble grumble

This commit is contained in:
Jeffrey Pfau 2014-11-16 03:58:06 -08:00
parent 6f4a6d6372
commit d030914c37
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/platform/qt/VideoView.cpp
View File

@ -90,21 +90,41 @@ VideoView::VideoView(QWidget* parent)
FFmpegEncoderInit(&m_encoder); FFmpegEncoderInit(&m_encoder);
addPreset(m_ui.preset1080, (Preset) { addPreset(m_ui.preset1080, (Preset) {
.container = QString(),
.vcodec = QString(),
.acodec = QString(),
.vbr = 0,
.abr = 0,
.width = 1620, .width = 1620,
.height = 1080 .height = 1080
}); });
addPreset(m_ui.preset720, (Preset) { addPreset(m_ui.preset720, (Preset) {
.container = QString(),
.vcodec = QString(),
.acodec = QString(),
.vbr = 0,
.abr = 0,
.width = 1080, .width = 1080,
.height = 720 .height = 720
}); });
addPreset(m_ui.preset480, (Preset) { addPreset(m_ui.preset480, (Preset) {
.container = QString(),
.vcodec = QString(),
.acodec = QString(),
.vbr = 0,
.abr = 0,
.width = 720, .width = 720,
.height = 480 .height = 480
}); });
addPreset(m_ui.preset160, (Preset) { addPreset(m_ui.preset160, (Preset) {
.container = QString(),
.vcodec = QString(),
.acodec = QString(),
.vbr = 0,
.abr = 0,
.width = 240, .width = 240,
.height = 160 .height = 160
}); });
@ -141,6 +161,8 @@ VideoView::VideoView(QWidget* parent)
.container = "MKV", .container = "MKV",
.vcodec = "PNG", .vcodec = "PNG",
.acodec = "FLAC", .acodec = "FLAC",
.vbr = 0,
.abr = 0,
.width = 240, .width = 240,
.height = 160, .height = 160,
}); });
@ -358,10 +380,10 @@ void VideoView::updateAspectRatio(int width, int height, bool force) {
void VideoView::uncheckIncompatible() { void VideoView::uncheckIncompatible() {
Preset current = { Preset current = {
.container = m_container, .container = m_container,
.acodec = m_audioCodec,
.vcodec = m_videoCodec, .vcodec = m_videoCodec,
.abr = m_abr / 1000, .acodec = m_audioCodec,
.vbr = m_vbr / 1000, .vbr = m_vbr / 1000,
.abr = m_abr / 1000,
.width = m_width, .width = m_width,
.height = m_height .height = m_height
}; };