summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorDaniel Sikeler <d.sikeler94@gmail.com>2014-08-28 12:18:10 +0000
committerAndras Timar <andras.timar@collabora.com>2014-09-15 17:07:48 +0200
commit4536040dd0572294e179bdd04dc9766fe7de9fb5 (patch)
tree1a6c25bcf1c2f071dd5d83ead7f29aaeb9ba5f9b /avmedia
parentd605999ec93066fcd890913d40b5e6abac27389b (diff)
fdo#82994: added missing media extensions
(cherry-picked from commit f43d50d1e470dbfbadb4e90135069f0ca89d65c7) Change-Id: Ibbce02b43192fd3afb4984f5f38251a518d7be06 Reviewed-on: https://gerrit.libreoffice.org/11172 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/11398 Tested-by: Thomas Arnhold <thomas@arnhold.org> Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/viewer/mediawindow.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 2d3460eefe37..111f5ccfcfcb 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -200,17 +200,22 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
{
static const char* pFilters[] = { "Advanced Audio Coding", "aac",
"AIF Audio", "aif;aiff",
+ "Advanced Systems Format", "asf;wma;wmv",
"AU Audio", "au",
+ "AC3 Audio", "ac3",
"AVI", "avi",
"CD Audio", "cda",
+ "Digital Video", "dv",
"FLAC Audio", "flac",
"Flash Video", "flv",
"Matroska Media", "mkv",
"MIDI Audio", "mid;midi",
- "MPEG Audio", "mp2;mp3;mpa",
+ "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",
"RMI MIDI Audio", "rmi",
"SND (SouND) Audio", "snd",
"Quicktime Video", "mov",