[Libreoffice-commits] core.git: avmedia/source

[Joel Madero]

 avmedia/source/viewer/mediawindow.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 5fb8aa777445d4bf150172459fe8f2581a35d854
Author: Joel Madero <jmadero.dev at gmail.com>
Date:   Tue Feb 19 17:01:33 2013 -0800

    fdo#36635 Added WMV/WMA/AAC to list of Movie and Sound File Types
    
    WMV, WMA and AAC are all supported but were not listed in movie and sound
    file types (Insert -> Movie and Sound...) so they would not appear in
    file browser unless you chose "Show All Files". Added these to list
    
    	modified:   avmedia/source/viewer/mediawindow.cxx
    
    Change-Id: I459b41a1ca647d7a90cec75436438097df5df962
    Reviewed-on: https://gerrit.libreoffice.org/2287
    Reviewed-by: Andras Timar <atimar at suse.com>
    Tested-by: Andras Timar <atimar at suse.com>

diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index f2dec68..574fa76 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -212,7 +212,8 @@ Window* MediaWindow::getWindow() const
 
 void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
 {
-    static const char* pFilters[] = { "AIF Audio", "aif;aiff",
+    static const char* pFilters[] = { "Advanced Audio Coding", "aac",
+                                      "AIF Audio", "aif;aiff",
                                       "AU Audio", "au",
                                       "AVI", "avi",
                                       "CD Audio", "cda",
@@ -225,7 +226,9 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
                                       "Quicktime Video", "mov",
                                       "Vivo Video", "viv",
                                       "WAVE Audio", "wav",
-                                      "WebM Video", "webm" };
+                                      "WebM Video", "webm",
+                                      "Windows Media Audio", "wma",
+                                      "Windows Media Video", "wmv"};
 
     for( size_t i = 0; i < SAL_N_ELEMENTS(pFilters); i += 2 )
     {