all repos — mgba @ d030914c3792d543d3917736a43ee32583714f3c

mGBA Game Boy Advance Emulator

Qt: Fix build with g++, grumble grumble
Jeffrey Pfau jeffrey@endrift.com
Sun, 16 Nov 2014 03:58:06 -0800
commit

d030914c3792d543d3917736a43ee32583714f3c

parent

6f4a6d6372a9f65be18c56e31edb228e073d3bfa

1 files changed, 24 insertions(+), 2 deletions(-)

jump to
M src/platform/qt/VideoView.cppsrc/platform/qt/VideoView.cpp

@@ -90,21 +90,41 @@

FFmpegEncoderInit(&m_encoder); addPreset(m_ui.preset1080, (Preset) { + .container = QString(), + .vcodec = QString(), + .acodec = QString(), + .vbr = 0, + .abr = 0, .width = 1620, .height = 1080 }); addPreset(m_ui.preset720, (Preset) { + .container = QString(), + .vcodec = QString(), + .acodec = QString(), + .vbr = 0, + .abr = 0, .width = 1080, .height = 720 }); addPreset(m_ui.preset480, (Preset) { + .container = QString(), + .vcodec = QString(), + .acodec = QString(), + .vbr = 0, + .abr = 0, .width = 720, .height = 480 }); addPreset(m_ui.preset160, (Preset) { + .container = QString(), + .vcodec = QString(), + .acodec = QString(), + .vbr = 0, + .abr = 0, .width = 240, .height = 160 });

@@ -141,6 +161,8 @@ addPreset(m_ui.presetLossless, (Preset) {

.container = "MKV", .vcodec = "PNG", .acodec = "FLAC", + .vbr = 0, + .abr = 0, .width = 240, .height = 160, });

@@ -358,10 +380,10 @@

void VideoView::uncheckIncompatible() { Preset current = { .container = m_container, - .acodec = m_audioCodec, .vcodec = m_videoCodec, - .abr = m_abr / 1000, + .acodec = m_audioCodec, .vbr = m_vbr / 1000, + .abr = m_abr / 1000, .width = m_width, .height = m_height };