all repos — mgba @ c101703b202775d5779e172810be21c10ad6912c

mGBA Game Boy Advance Emulator

Qt: Re-add Xvid and use YUV libx264 instead of RGB
Jeffrey Pfau jeffrey@endrift.com
Tue, 28 Oct 2014 02:26:47 -0700
commit

c101703b202775d5779e172810be21c10ad6912c

parent

3878e4b1965a2d5026f1ebabc6dc9394bdc968d1

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

jump to
M src/platform/qt/VideoView.cpp → src/platform/qt/VideoView.cpp 
@@ -25,7 +25,8 @@ s_acodecMap["mp3"] = "libmp3lame";
 		s_acodecMap["uncompressed"] = "pcm_s16le";
 	}
 	if (s_vcodecMap.empty()) {
-		s_vcodecMap["h264"] = "libx264rgb";
+		s_vcodecMap["h264"] = "libx264";
+		s_vcodecMap["xvid"] = "libxvid";
 	}
 	if (s_containerMap.empty()) {
 		s_containerMap["mkv"] = "matroska";
M src/platform/qt/VideoView.ui → src/platform/qt/VideoView.ui 
@@ -68,6 +68,11 @@ </property>
         </item>
         <item>
          <property name="text">
+          <string>Xvid</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
           <string>FFV1</string>
          </property>
         </item>