summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorJoel Madero <jmadero.dev@gmail.com>2013-02-19 17:01:33 -0800
committerAndras Timar <atimar@suse.com>2013-02-20 08:53:33 +0000
commit5fb8aa777445d4bf150172459fe8f2581a35d854 (patch)
tree1b34921dd18430a2ca040e721944812bfa639b2f /avmedia
parentd4b904f7d15be8460dbff4cf6c8d500aea5a4fa3 (diff)
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@suse.com> Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/viewer/mediawindow.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index f2dec68e21e1..574fa7668431 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 )
{