all repos — mgba @ 04af84a1d2a5f1e36fdae26b8fc500285d29a7ae

mGBA Game Boy Advance Emulator

Qt: Add some more video formats
Jeffrey Pfau jeffrey@endrift.com
Mon, 10 Nov 2014 04:52:34 -0800
commit

04af84a1d2a5f1e36fdae26b8fc500285d29a7ae

parent

9f5df2a6f2cc5fe0e7bdf478d7882e11c8dc8faa

2 files changed, 15 insertions(+), 0 deletions(-)

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

@@ -25,7 +25,12 @@ s_acodecMap["mp3"] = "libmp3lame";

s_acodecMap["uncompressed"] = "pcm_s16le"; } if (s_vcodecMap.empty()) { + s_vcodecMap["dirac"] = "libschroedinger"; s_vcodecMap["h264"] = "libx264"; + s_vcodecMap["hevc"] = "libx265"; + s_vcodecMap["theora"] = "libtheora"; + s_vcodecMap["vp8"] = "libvpx"; + s_vcodecMap["vp9"] = "libvpx-vp9"; s_vcodecMap["xvid"] = "libxvid"; } if (s_containerMap.empty()) {
M src/platform/qt/VideoView.uisrc/platform/qt/VideoView.ui

@@ -41,6 +41,11 @@ </property>

</item> <item> <property name="text"> + <string>WebM</string> + </property> + </item> + <item> + <property name="text"> <string>AVI</string> </property> </item>

@@ -64,6 +69,11 @@ </item>

<item> <property name="text"> <string>h.264</string> + </property> + </item> + <item> + <property name="text"> + <string>VP8</string> </property> </item> <item>