[vlc-devel] commit: Qt: there is no such fourcc as 'wma' (Jean-Baptiste Kempf )

git version control git at videolan.org
Fri Jun 12 00:29:02 CEST 2009


vlc | branch: 1.0-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jun 12 00:25:06 2009 +0200| [a24641018920c7afa2e7aedefca224bf04001897] | committer: Jean-Baptiste Kempf 

Qt: there is no such fourcc as 'wma'
(cherry picked from commit 55e543cdc1258e19f4cc5bb56c853466fb63756b)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a24641018920c7afa2e7aedefca224bf04001897
---

 .../gui/qt4/components/sout/profile_selector.cpp   |    2 +-
 modules/gui/qt4/components/sout/profiles.hpp       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/sout/profile_selector.cpp b/modules/gui/qt4/components/sout/profile_selector.cpp
index 3ebaa66..064cd8d 100644
--- a/modules/gui/qt4/components/sout/profile_selector.cpp
+++ b/modules/gui/qt4/components/sout/profile_selector.cpp
@@ -285,7 +285,7 @@ inline void VLCProfileEditor::registerCodecs()
     ADD_ACODEC( "Flac", "flac" )
     ADD_ACODEC( "Speex", "spx" )
     ADD_ACODEC( "WAV", "s16l" )
-    ADD_ACODEC( "WMA", "wma" )
+    ADD_ACODEC( "WMA2", "wma2" )
 #undef ADD_ACODEC
 
 #define ADD_SCALING( factor ) ui.vScaleBox->addItem( factor );
diff --git a/modules/gui/qt4/components/sout/profiles.hpp b/modules/gui/qt4/components/sout/profiles.hpp
index cca95ad..d554e02 100644
--- a/modules/gui/qt4/components/sout/profiles.hpp
+++ b/modules/gui/qt4/components/sout/profiles.hpp
@@ -28,7 +28,7 @@ static const char *const video_profile_value_list[] = {
     "ogg;1;1;0;theo;800;1;0;0;0;flac;128;2;44100;0;0",
     "mp4;1;1;0;mp4v;800;1;0;0;0;mp4a;128;2;44100;0;0",
     "ts;1;1;0;mp2v;800;1;0;0;0;mpga;128;2;44100;0;0",
-    "asf;1;1;0;WMV2;800;1;0;0;0;wma;128;2;44100;0;0",
+    "asf;1;1;0;WMV2;800;1;0;0;0;wma2;128;2;44100;0;0",
     "asf;1;1;0;DIV3;800;1;0;0;0;mp3;128;2;44100;0;0",
     "ogg;0;1;0;0;800;1;0;0;0;vorb;128;2;44100;0;0",
     "raw;0;1;0;0;800;1;0;0;0;mp3;128;2;44100;0;0",




More information about the vlc-devel mailing list