summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorDaniel Sikeler <d.sikeler94@gmail.com>2014-09-10 11:56:42 +0000
committerThomas Arnhold <thomas@arnhold.org>2014-09-12 08:44:43 +0000
commit1d3a8908fe8a441469ffd336a445c2b361db5d7f (patch)
tree127911b10af44b1a1556b9ea250056a368547c17 /avmedia
parent67f81142709a83494ce14441d5d525d5c1553616 (diff)
fdo#82994 Added some more audio formats
(cherry-picked from commit 380a4618dd8205c56a5c6622e01e88ae8911fe5e) Change-Id: I0acd880dc1886f46e1fe146941f1027c9b6ab265 Reviewed-on: https://gerrit.libreoffice.org/11388 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/11403 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/viewer/mediawindow.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 1e40f852c5af..64e270a887b5 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -201,7 +201,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
{
static const char* pFilters[] = { "Advanced Audio Coding", "aac",
"AIF Audio", "aif;aiff",
- "Advanced Systems", "asf",
+ "Advanced Systems Format", "asf;wma;wmv",
"AU Audio", "au",
"AC3 Audio", "ac3",
"AVI", "avi",
@@ -213,7 +213,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
"MIDI Audio", "mid;midi",
"MPEG Audio", "mp2;mp3;mpa;m4a",
"MPEG Video", "mpg;mpeg;mpv;mp4;m4v",
- "Ogg Audio", "ogg;oga",
+ "Ogg Audio", "ogg;oga;opus",
"Ogg Video", "ogv;ogx",
"Real Audio", "ra",
"Real Media", "rm",